Merge branch 'dev' into feat/insert_turtle_here

Author: KTrain5169

.github/COPILOT_INSTRUCTIONS.md .github/copilot-instructions.md.github/COPILOT_INSTRUCTIONS.md renamed to .github/copilot-instructions.md

@@ -6,6 +6,13 @@ Since v2.1.0, we're keeping a changelog of each version's changes in NeuroPilot.
 
 Changes between each version before then will not be listed.
 
+## 2.2.3
+
+### Fixes
+
+- Fixed error catching not working in Copilot mode.
+- Fixed Delete File not displaying the targeted file in Copilot mode (used to return `undefined`)
+
 ## 2.2.2
 
 ### New settings

CHANGELOG.md

@@ -4,7 +4,7 @@
 	"private": true,
 	"description": "Allows Neuro-sama to either act as a companion/copilot or control Visual Studio Code by herself.",
 	"icon": "assets/heart-xaendril.png",
-	"version": "2.2.1",
+	"version": "2.2.2",
 	"publisher": "VSC-NeuroPilot",
 	"repository": "https://github.com/VSC-NeuroPilot/neuropilot",
 	"homepage": "https://vsc-neuropilot.github.io/neuropilot",
@@ -962,7 +962,7 @@
 		}
 	},
 	"scripts": {
- 		"preinstall": "node ./scripts/check-malicious-packages.js",
+		"preinstall": "node ./scripts/check-malicious-packages.js",
 		"version:changesets": "changeset version --global-changelog",
 		"push": "tsx ./dual-publish.ts",
 		"vscode:prepublish": "pnpm build",
@@ -985,7 +985,7 @@
 		"watch:web:esbuild": "node ./scripts/esbuild.mjs --watch --mode web",
 		"watch:web:tsc": "tsc --noEmit --watch --project tsconfig.web.json",
 		"watch:desktop:esbuild": "node ./scripts/esbuild.mjs --watch --mode desktop",
-		"watch:desktop:tsc": "tsc --noEmit --watch --project tsconfig.app.json",				
+		"watch:desktop:tsc": "tsc --noEmit --watch --project tsconfig.app.json",
 		"test:web": "pnpm run build:web && npm-run-all -s test:web:tsc test:web:esbuild test:web:browser",
 		"test:web:tsc": "tsc --noEmit --project test-tsconfigs/tsconfig.web.json",
 		"test:web:esbuild": "node ./scripts/esbuild.mjs --mode web --test",

package.json

@@ -2,7 +2,7 @@
 import * as vscode from 'vscode';
 
 import { NEURO } from '@/constants';
-import { formatContext, getFence, getPositionContext, getVirtualCursor, getWorkspacePath, getWorkspaceUri, isBinary, isPathNeuroSafe, logOutput, normalizePath } from '@/utils';
+import { formatContext, getFence, getPositionContext, getVirtualCursor, getWorkspacePath, getWorkspaceUri, isBinary, isPathNeuroSafe, logOutput, normalizePath, notifyOnCaughtException } from '@/utils';
 import { ActionData, contextNoAccess, RCEAction, actionValidationFailure, actionValidationAccept, ActionValidationResult, stripToActions } from '@/neuro_client_helper';
 import { CONFIG, PERMISSIONS, PermissionLevel, getPermissionLevel, isActionEnabled } from '@/config';
 import { targetedFileCreatedEvent, targetedFileDeletedEvent } from '@events/files';
@@ -43,8 +43,9 @@ async function getUriExistence(uri: vscode.Uri): Promise<boolean> {
 	try {
 		await vscode.workspace.fs.stat(uri);
 		return true;
-	} catch {
-		return false;
+	} catch (erm: unknown) {
+        if (erm instanceof vscode.FileSystemError && erm.code === 'FileNotFound') return false;
+		else throw erm;
 	}
 }
 
@@ -250,7 +251,7 @@ export const fileActions = {
             (actionData: ActionData) => targetedFileDeletedEvent(actionData.params?.path),
         ],
         validators: [neuroSafeDeleteValidation],
-        promptGenerator: (actionData: ActionData) => `delete "${actionData.params?.pathToDelete}".`,
+        promptGenerator: (actionData: ActionData) => `delete "${actionData.params?.path}".`,
     },
 } satisfies Record<string, RCEAction>;
 
@@ -304,13 +305,19 @@ export function handleCreateFile(actionData: ActionData): string | undefined {
             // If no error is thrown, the file already exists
             NEURO.client?.sendContext(`Could not create file: File ${relativePath} already exists`);
             return;
-        } catch { /* File does not exist, continue */ }
+        } catch (erm: unknown) {
+            if ((erm as vscode.FileSystemError).code !== 'FileNotFound') {
+                notifyOnCaughtException('create_file', erm);
+                return;
+            };
+            /* else, file does not exist, continue */
+        }
 
         // Create the file
         try {
             await vscode.workspace.fs.writeFile(fileUri, new Uint8Array(0));
         } catch (erm: unknown) {
-            logOutput('ERROR', `Failed to create file ${relativePath}: ${erm}`);
+            notifyOnCaughtException('create_file', erm);
             NEURO.client?.sendContext(`Failed to create file ${relativePath}`);
             return;
         }
@@ -353,13 +360,19 @@ export function handleCreateFolder(actionData: ActionData): string | undefined {
 			// If no error is thrown, the folder already exists
 			NEURO.client?.sendContext(`Could not create folder: Folder ${relativePath} already exists`);
 			return;
-		} catch { /* Folder does not exist, continue */ }
+		} catch (erm: unknown) {
+            if ((erm as vscode.FileSystemError).code !== 'FileNotFound') {
+                notifyOnCaughtException('create_folder', erm);
+                return;
+            }
+            /* else, folder does not exist, continue */
+        }
 
 		// Create the folder
 		try {
 			await vscode.workspace.fs.createDirectory(folderUri);
 		} catch (erm: unknown) {
-			logOutput('ERROR', `Failed to create folder ${relativePath}: ${erm}`);
+			notifyOnCaughtException('create_folder', erm);
 			NEURO.client?.sendContext(`Failed to create folder ${relativePath}`);
 			return;
 		}
@@ -393,13 +406,19 @@ export function handleRenameFileOrFolder(actionData: ActionData): string | undef
             // If no error is thrown, the new path already exists
             NEURO.client?.sendContext(`Could not rename: ${newRelativePath} already exists`);
             return;
-        } catch { /* New path does not exist, continue */ }
+        } catch (erm: unknown) {
+            if ((erm as vscode.FileSystemError).code !== 'FileNotFound') {
+                notifyOnCaughtException('rename_file_or_folder', erm);
+                return;
+            };
+            /* New path does not exist, continue */
+        }
 
         // Rename the file/folder
         try {
             await vscode.workspace.fs.rename(oldUri, newUri);
         } catch (erm: unknown) {
-            logOutput('ERROR', `Failed to rename ${oldRelativePath} to ${newRelativePath}: ${erm}`);
+            notifyOnCaughtException('rename_file_or_folder', erm);
             NEURO.client?.sendContext(`Failed to rename ${oldRelativePath} to ${newRelativePath}`);
             return;
         }
@@ -429,9 +448,14 @@ export function handleDeleteFileOrFolder(actionData: ActionData): string | undef
 		// Check if the path exists
 		try {
 			stat = await vscode.workspace.fs.stat(uri);
-		} catch {
-			NEURO.client?.sendContext(`Could not delete: ${relativePath} does not exist`);
-			return;
+		} catch (erm: unknown) {
+            if (erm instanceof vscode.FileSystemError && erm.code === 'FileNotFound') {
+                NEURO.client?.sendContext(`Could not delete: ${relativePath} does not exist`);
+			    return;
+            } else {
+                notifyOnCaughtException('delete_file_or_folder', erm);
+                return;
+            }
 		}
 
 		// Check for correct recursive parameter
@@ -570,7 +594,7 @@ export function handleOpenFile(actionData: ActionData): string | undefined {
 				}
 			}
         } catch (erm: unknown) {
-            logOutput('ERROR', `Failed to open file ${relativePath}: ${erm}`);
+            notifyOnCaughtException('open_file', erm);
             NEURO.client?.sendContext(`Failed to open file ${relativePath}`);
         }
     }
@@ -598,7 +622,8 @@ export function handleReadFile(actionData: ActionData): string | undefined {
             },
         );
     } catch (erm: unknown) {
-        logOutput('ERROR', `Error occured while trying to access file ${file}: ${erm}`);
+        notifyOnCaughtException('read_file', erm);
+        NEURO.client?.sendContext(`Unable to read file ${file}`);
     }
 }
 

src/file_actions.ts

@@ -37,8 +37,9 @@ async function getUriExistence(uri: vscode.Uri): Promise<boolean> {
     try {
         await vscode.workspace.fs.stat(uri);
         return true;
-    } catch {
-        return false;
+    } catch (erm: unknown) {
+        if (erm instanceof vscode.FileSystemError && erm.code === 'FileNotFound') return false;
+        else throw erm;
     }
 }
 

src/lint_problems.ts

@@ -47,6 +47,10 @@ export interface RceRequest {
      * Disposable events
      */
     cancelEvents?: vscode.Disposable[]
+    /**
+     * The action data associated with this request.
+     */
+    actionData: ActionData;
 }
 
 export const cancelRequestAction: RCEAction = {
@@ -103,10 +107,13 @@ export function clearRceRequest(): void {
  * Creates a new RCE request and attaches it to NEURO.
  * @param prompt The prompt to be displayed in the notification.
  * @param callback The callback function to be executed when the request is accepted.
+ * @param actionData The action data associated with this request.
+ * @param cancelEvents Optional array of disposables for cancellation events.
  */
 export function createRceRequest(
     prompt: string,
     callback: () => string | undefined,
+    actionData: ActionData,
     cancelEvents?: vscode.Disposable[],
 ): void {
     NEURO.rceRequest = {
@@ -118,6 +125,7 @@ export function createRceRequest(
         resolve: () => { },
         attachNotification: async () => { },
         cancelEvents,
+        actionData,
     };
 
     const promise = new Promise<void>((resolve) => {
@@ -220,9 +228,15 @@ export function acceptRceRequest(): void {
 
     NEURO.client?.sendContext(`${CONNECTION.userName} has accepted your request.`);
 
-    const result = NEURO.rceRequest.callback();
-    if (result)
-        NEURO.client?.sendContext(result);
+    try {
+        const result = NEURO.rceRequest.callback();
+        if (result)
+            NEURO.client?.sendContext(result);
+    } catch (erm: unknown) {
+        const actionName = NEURO.rceRequest.actionData.name;
+        notifyOnCaughtException(actionName, erm);
+        NEURO.client?.sendActionResult(NEURO.rceRequest.actionData.id, true, `An error occured while executing the action "${actionName}". You can retry if you like, but it may be better to ask Vedal to check what's up.`);
+    }
 
     clearRceRequest();
 }
@@ -369,6 +383,7 @@ export async function RCEActionHandler(actionData: ActionData, actionList: Recor
                 createRceRequest(
                     prompt,
                     () => action.handler(actionData),
+                    actionData,
                     eventArray,
                 );