Merge branch 'dev' into feat/warn-all-schema-problems

Author: KTrain5169

CHANGELOG.md

@@ -8,6 +8,13 @@ Changes between each version before then will not be listed.
 
 ## 2.2.2
 
+### Added features
+
+- If an exception was thrown while executing an action, it will be caught and you will be notified about it.
+  - Neuro will also receive an action result telling her that an error occured.
+  - Obviously under normal circumstances, this shouldn't be useful. If it does occur, please report it! There is a button to open to our GitHub issues page to report it.
+    - There are also buttons to disable the attempted action and to view logs.
+
 ### Changes
 
 - Neuro can now get cookies by herself, if `neuropilot.permission.requestCookies` is set to `Autopilot`.

package.json

@@ -161,6 +161,11 @@
 				"title": "Open a specific page in the docs",
 				"category": "NeuroPilot"
 			},
+			{
+				"command": "neuropilot.resetTemporarilyDisabledActions",
+				"title": "Reset temporarily disabled actions",
+				"category": "NeuroPilot"
+			},
 			{
 				"command": "neuropilot.sendSelectionToNeuro",
 				"title": "Send selection to Neuro",

src/config.ts

@@ -225,9 +225,8 @@ function getActions<T>(key: string): T | undefined {
 }
 
 export function isActionEnabled(action: string | Action): boolean {
-    if (typeof action === 'string')
-        return !ACTIONS.disabledActions.includes(action);
-    return !ACTIONS.disabledActions.includes(action.name);
+    const name = typeof action === 'string' ? action : action.name;
+    return !ACTIONS.disabledActions.includes(name) && !NEURO.tempDisabledActions.includes(name);
 }
 
 //#endregion

src/constants.ts

@@ -78,6 +78,8 @@ interface Neuro {
     killSwitch: boolean;
     /** The last known user selection, or null if there is none or it is in a non-Neuro-safe file. */
     lastKnownUserSelection: vscode.Selection | null;
+    /** Any temporarily disabled actions for this session. */
+    tempDisabledActions: string[]
 }
 
 
@@ -111,6 +113,7 @@ export const NEURO: Neuro = {
     currentController: null,
     killSwitch: false,
     lastKnownUserSelection: null,
+    tempDisabledActions: [],
 };
 
 // this will likely be transformed for a different use later when the API rolls around

src/context.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 
-import { getFence, logOutput, simpleFileName } from '@/utils';
+import { getFence, logOutput, notifyOnCaughtException, simpleFileName } from '@/utils';
 import { NEURO } from '@/constants';
 import { PERMISSIONS, PermissionLevel, getPermissionLevel, isActionEnabled } from '@/config';
 
@@ -53,43 +53,50 @@ export function registerRequestCookieHandler() {
         if (actionData.name === 'request_cookie') {
             NEURO.actionHandled = true;
 
-            if (NEURO.waitingForCookie) {
-                logOutput('INFO', 'Already waiting for a cookie');
-                NEURO.client?.sendActionResult(actionData.id, true, 'You already asked for a cookie.');
-                return;
-            }
+            try {
+                if (NEURO.waitingForCookie) {
+                    logOutput('INFO', 'Already waiting for a cookie');
+                    NEURO.client?.sendActionResult(actionData.id, true, 'You already asked for a cookie.');
+                    return;
+                }
 
-            const permission = getPermissionLevel(PERMISSIONS.requestCookies);
+                const permission = getPermissionLevel(PERMISSIONS.requestCookies);
 
-            switch (permission) {
-                case PermissionLevel.OFF:
-                    logOutput('WARNING', 'Neuro attempted to request a cookie, but permission is disabled');
-                    NEURO.client?.sendActionResult(actionData.id, true, 'Permission to request cookies is disabled.');
-                    break;
-                case PermissionLevel.COPILOT:
-                    NEURO.waitingForCookie = true;
-                    vscode.window.showInformationMessage(
-                        `${NEURO.currentController} is asking for a${actionData.params?.flavor ? ' ' + actionData.params.flavor : ''} cookie.`,
-                        'Give',
-                        'Deny',
-                    ).then((value) => {
-                        if (value === 'Give') {
-                            giveCookie(true, actionData.params?.flavor);
-                        } else if (value === 'Deny' || value === undefined) {
-                            denyCookie();
+                switch (permission) {
+                    case PermissionLevel.OFF:
+                        logOutput('WARNING', 'Neuro attempted to request a cookie, but permission is disabled');
+                        NEURO.client?.sendActionResult(actionData.id, true, 'Permission to request cookies is disabled.');
+                        break;
+                    case PermissionLevel.COPILOT:
+                        NEURO.waitingForCookie = true;
+                        vscode.window.showInformationMessage(
+                            `${NEURO.currentController} is asking for a${actionData.params?.flavor ? ' ' + actionData.params.flavor : ''} cookie.`,
+                            'Give',
+                            'Deny',
+                        ).then((value) => {
+                            if (value === 'Give') {
+                                giveCookie(true, actionData.params?.flavor);
+                            } else if (value === 'Deny' || value === undefined) {
+                                denyCookie();
+                            }
+                            NEURO.waitingForCookie = false;
+                        });
+                        NEURO.client?.sendActionResult(actionData.id, true, 'Vedal has been asked for a cookie.');
+                        break;
+                    case PermissionLevel.AUTOPILOT:
+                        if (!actionData.params?.flavor) {
+                            NEURO.client?.sendActionResult(actionData.id, false, 'You need to specify a flavor!');
+                            break;
                         }
-                        NEURO.waitingForCookie = false;
-                    });
-                    NEURO.client?.sendActionResult(actionData.id, true, 'Vedal has been asked for a cookie.');
-                    break;
-                case PermissionLevel.AUTOPILOT:
-                    if (!actionData.params?.flavor) {
-                        NEURO.client?.sendActionResult(actionData.id, false, 'You need to specify a flavor!');
+                        logOutput('INFO', `Neuro grabbed a ${actionData.params?.flavor} cookie.`);
+                        NEURO.client?.sendActionResult(actionData.id, true, `You grabbed a ${actionData.params?.flavor} cookie!`);
                         break;
-                    }
-                    logOutput('INFO', `Neuro grabbed a ${actionData.params?.flavor} cookie.`);
-                    NEURO.client?.sendActionResult(actionData.id, true, `You grabbed a ${actionData.params?.flavor} cookie!`);
-                    break;
+                }
+            } catch (erm) {
+                const actionName = actionData.name;
+                notifyOnCaughtException(actionName, erm);
+                NEURO.client?.sendActionResult(actionData.id, true, `An error occured while executing the action "${actionName}". You may retry if you like, but it may be better to ask Vedal to check what's up.`);
+                return;
             }
         }
     });