fix: log correct tool call error from gui

core/protocol/core.ts

@@ -307,7 +307,7 @@ export type ToCoreFromIdeOrWebviewProtocol = {
   "auth/getAuthUrl": [{ useOnboarding: boolean }, { url: string }];
   "tools/call": [
     { toolCall: ToolCall },
-    { contextItems: ContextItem[]; errorMessage?: string },
+    { contextItems: ContextItem[]; errorMessage?: string; errorReason?: string },
   ];
   "tools/evaluatePolicy": [
     { toolName: string; basePolicy: ToolPolicy; args: Record<string, unknown> },

core/tools/callTool.ts

@@ -1,6 +1,7 @@
 import { CallToolResultSchema } from "@modelcontextprotocol/sdk/types.js";
 import { ContextItem, Tool, ToolCall, ToolExtras } from "..";
 import { MCPManagerSingleton } from "../context/mcp/MCPManagerSingleton";
+import { ContinueError } from "../util/errors";
 import { canParseUrl } from "../util/url";
 import { BuiltInToolNames } from "./builtIn";
 
@@ -197,6 +198,7 @@ export async function callTool(
 ): Promise<{
   contextItems: ContextItem[];
   errorMessage: string | undefined;
+  errorReason?: string;
 }> {
   try {
     const args = safeParseToolCallArgs(toolCall);
@@ -214,12 +216,19 @@ export async function callTool(
     };
   } catch (e) {
     let errorMessage = `${e}`;
-    if (e instanceof Error) {
+    let errorReason: string | undefined;
+
+    if (e instanceof ContinueError) {
+      errorMessage = e.message;
+      errorReason = e.reason;
+    } else if (e instanceof Error) {
       errorMessage = e.message;
     }
+
     return {
       contextItems: [],
       errorMessage,
+      errorReason,
     };
   }
 }

core/tools/implementations/readFile.ts

@@ -5,6 +5,7 @@ import { ToolImpl } from ".";
 import { throwIfFileIsSecurityConcern } from "../../indexing/ignore";
 import { getStringArg } from "../parseArgs";
 import { throwIfFileExceedsHalfOfContext } from "./readFileLimit";
+import { ContinueError, ContinueErrorReason } from "../../util/errors";
 
 export const readFileImpl: ToolImpl = async (args, extras) => {
   const filepath = getStringArg(args, "filepath");

gui/src/redux/thunks/callToolById.ts

@@ -94,7 +94,7 @@ export const callToolById = createAsyncThunk<
       output = result.content.contextItems;
       error = result.content.errorMessage
         ? new ContinueError(
-            ContinueErrorReason.Unspecified,
+            (result.content.errorReason as ContinueErrorReason) || ContinueErrorReason.Unspecified,
             result.content.errorMessage,
           )
         : undefined;