Fix error catching not working in Copilot mode

Author: Pasu4

CHANGELOG.md

@@ -6,6 +6,12 @@ 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.
+
 ## 2.2.2
 
 ### Added features

src/rce.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('Vedal 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,
                 );