@nexrall/code-core 1.4.44 → 1.4.46

package/dist/agent/loop.js

@@ -3123,7 +3123,7 @@ async function runAgentLoop(initialMessages, options) {
                                 // 2. Try MCP tools (serverName__toolName)
                             }
                             else if (options.mcpManager?.isMcpTool(name)) {
-                                const mcpOutput = await options.mcpManager.callTool(name, input);
+                                const mcpOutput = await options.mcpManager.callTool(name, input, options.abortSignal);
                                 result = { output: mcpOutput ?? '' };
                                 // 3. Fall through to built-in executor
                             }

package/dist/mcp/manager.d.ts

@@ -25,8 +25,26 @@ export declare class McpManager {
     connectAll(config: McpConfig): Promise<void>;
     /** Returns all MCP tools as Anthropic-compatible tool definitions. */
     getAnthropicTools(): AnthropicTool[];
-    /** Execute an MCP tool call. Returns null if this tool is not an MCP tool. */
-    callTool(prefixedName: string, input: Record<string, unknown>): Promise<string | null>;
+    /**
+     * Execute an MCP tool call. Returns null if this tool is not an MCP tool.
+     *
+     * `abortSignal` is optional and best-effort: the underlying transports (stdio
+     * JSON-RPC / HTTP / SSE) have no cancellation message in this client, so an
+     * abort here does NOT stop the server from finishing its work — it only stops
+     * THIS CALL from making the caller wait for it. Before this was added, Ctrl+C
+     * during an MCP tool call was silently swallowed: loop.ts set
+     * `abortSignal.aborted = true` but nothing downstream of `options.mcpManager
+     * .callTool(name, input)` ever looked at it, so the user's only way out was
+     * to wait out the full 60s MCP_TOOL_TIMEOUT_MS (or however long the server
+     * actually took). Racing the same abortSignal the 60s timeout already races
+     * against makes Ctrl+C return control immediately instead of up to a minute
+     * later — matching how the `bash` tool already behaves (its own 200ms abort
+     * poll in executor.ts), just without the ability to also kill a remote
+     * server's in-flight work the way `bash` can kill a local child process.
+     */
+    callTool(prefixedName: string, input: Record<string, unknown>, abortSignal?: {
+        aborted: boolean;
+    }): Promise<string | null>;
     /** True if this tool name belongs to an MCP server. */
     isMcpTool(name: string): boolean;
     get serverNames(): string[];

package/dist/mcp/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/mcp/manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,eAAe,EAAE,iBAAiB,EAAgB,MAAM,UAAU,CAAC;AAOvF,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC7C;AAGD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE;QACZ,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAID,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAmC;IAEnD,OAAO,CAAC,QAAQ,CAA6B;IAE7C,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAA6B;IAE5C,OAAO,CAAC,UAAU,CAA6B;IAE/C,+FAA+F;IAC/F,OAAO,CAAC,MAAM,CAAC,UAAU;IAMzB,oGAAoG;IACpG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IA2B7C,mFAAmF;IAC7E,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BlD,sEAAsE;IACtE,iBAAiB,IAAI,aAAa,EAAE;IAkBpC,8EAA8E;IACxE,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAkB5F,uDAAuD;IACvD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIhC,IAAI,WAAW,IAAI,MAAM,EAAE,CAE1B;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,OAAO,CAAC,MAAM,CAAC,WAAW;IAK1B,8FAA8F;IAC9F,SAAS,IAAI,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;QAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAY9J,uFAAuF;IACvF,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAMnC,+CAA+C;IAC/C,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM;IAMrE,OAAO,CAAC,MAAM,CAAC,cAAc;IAS7B,OAAO,CAAC,MAAM,CAAC,eAAe;IAK9B,iEAAiE;IACjE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,GAAE,SAAS,GAAG,MAAkB,GAAG,IAAI;IAOrH,+FAA+F;IAC/F,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAc3D,aAAa,IAAI,IAAI;CAQtB"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/mcp/manager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,eAAe,EAAE,iBAAiB,EAAgB,MAAM,UAAU,CAAC;AAOvF,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC7C;AAGD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE;QACZ,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACrC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAID,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAmC;IAEnD,OAAO,CAAC,QAAQ,CAA6B;IAE7C,OAAO,CAAC,QAAQ,CAAsC;IACtD,OAAO,CAAC,OAAO,CAA6B;IAE5C,OAAO,CAAC,UAAU,CAA6B;IAE/C,+FAA+F;IAC/F,OAAO,CAAC,MAAM,CAAC,UAAU;IAMzB,oGAAoG;IACpG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IA2B7C,mFAAmF;IAC7E,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BlD,sEAAsE;IACtE,iBAAiB,IAAI,aAAa,EAAE;IAkBpC;;;;;;;;;;;;;;;;OAgBG;IACG,QAAQ,CACZ,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,WAAW,CAAC,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,GACjC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAoCzB,uDAAuD;IACvD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIhC,IAAI,WAAW,IAAI,MAAM,EAAE,CAE1B;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,OAAO,CAAC,MAAM,CAAC,WAAW;IAK1B,8FAA8F;IAC9F,SAAS,IAAI,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;QAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAY9J,uFAAuF;IACvF,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAMnC,+CAA+C;IAC/C,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM;IAMrE,OAAO,CAAC,MAAM,CAAC,cAAc;IAS7B,OAAO,CAAC,MAAM,CAAC,eAAe;IAK9B,iEAAiE;IACjE,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,GAAE,SAAS,GAAG,MAAkB,GAAG,IAAI;IAOrH,+FAA+F;IAC/F,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAc3D,aAAa,IAAI,IAAI;CAQtB"}

package/dist/mcp/manager.js

@@ -132,8 +132,24 @@ class McpManager {
         }
         return tools;
     }
-    /** Execute an MCP tool call. Returns null if this tool is not an MCP tool. */
-    async callTool(prefixedName, input) {
+    /**
+     * Execute an MCP tool call. Returns null if this tool is not an MCP tool.
+     *
+     * `abortSignal` is optional and best-effort: the underlying transports (stdio
+     * JSON-RPC / HTTP / SSE) have no cancellation message in this client, so an
+     * abort here does NOT stop the server from finishing its work — it only stops
+     * THIS CALL from making the caller wait for it. Before this was added, Ctrl+C
+     * during an MCP tool call was silently swallowed: loop.ts set
+     * `abortSignal.aborted = true` but nothing downstream of `options.mcpManager
+     * .callTool(name, input)` ever looked at it, so the user's only way out was
+     * to wait out the full 60s MCP_TOOL_TIMEOUT_MS (or however long the server
+     * actually took). Racing the same abortSignal the 60s timeout already races
+     * against makes Ctrl+C return control immediately instead of up to a minute
+     * later — matching how the `bash` tool already behaves (its own 200ms abort
+     * poll in executor.ts), just without the ability to also kill a remote
+     * server's in-flight work the way `bash` can kill a local child process.
+     */
+    async callTool(prefixedName, input, abortSignal) {
         const serverName = this._toolMap.get(prefixedName);
         if (!serverName)
             return null;
@@ -145,7 +161,24 @@ class McpManager {
         // Enforce a timeout — a hung MCP server would otherwise block the agent loop forever.
         const MCP_TOOL_TIMEOUT_MS = 60000;
         const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error(`MCP tool "${prefixedName}" timed out after ${MCP_TOOL_TIMEOUT_MS / 1000}s`)), MCP_TOOL_TIMEOUT_MS));
-        return Promise.race([client.callTool(toolName, input), timeoutPromise]);
+        const racers = [client.callTool(toolName, input), timeoutPromise];
+        if (abortSignal) {
+            let pollId;
+            const abortPromise = new Promise((_, reject) => {
+                pollId = setInterval(() => {
+                    if (abortSignal.aborted) {
+                        clearInterval(pollId);
+                        reject(Object.assign(new Error('Aborted'), { name: 'AbortError' }));
+                    }
+                }, 100);
+            });
+            racers.push(abortPromise);
+            // Clearing the poll on whichever branch wins avoids leaving a live interval
+            // (and the closure it holds) running for the rest of the process lifetime —
+            // the same leak-prevention pattern client.ts uses for its own abort poll.
+            return Promise.race(racers).finally(() => clearInterval(pollId));
+        }
+        return Promise.race(racers);
     }
     /** True if this tool name belongs to an MCP server. */
     isMcpTool(name) {

package/dist/tools/executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/tools/executor.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAyB,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAqzEtE,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,WAAW,CAAC,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,EAClC,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GACjC,OAAO,CAAC,UAAU,CAAC,CAoBrB"}
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/tools/executor.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAyB,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAg3EtE,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,WAAW,CAAC,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,EAClC,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GACjC,OAAO,CAAC,UAAU,CAAC,CA6BrB"}

package/dist/tools/executor.js

@@ -1617,7 +1617,7 @@ function fetchBlocklistCheck(parsedUrl) {
     }
     return null;
 }
-async function fetchUrl(input, _workDir, _redirectCount = 0) {
+async function fetchUrl(input, _workDir, _redirectCount = 0, abortSignal) {
     const url = typeof input.url === 'string' ? input.url : '';
     if (!url)
         return { error: 'Missing required parameter: url' };
@@ -1674,8 +1674,28 @@ async function fetchUrl(input, _workDir, _redirectCount = 0) {
             if (settled)
                 return;
             settled = true;
+            if (abortPoll !== undefined)
+                clearInterval(abortPoll);
             resolve(result);
         };
+        // Poll for Ctrl+C the same way the `bash` tool does (executor.ts's own
+        // 200ms abort poll below this function) — fetch_url had NO abort wiring at
+        // all before this, so a user hitting Ctrl+C while the model waited on a slow
+        // page had to sit through the full DEFAULT_TIMEOUT_MS (60s) with no way out.
+        // `selfAborted` (already used for our own intentional destroy() below) is
+        // reused here so an abort-triggered destroy() doesn't ALSO surface as a
+        // generic "socket hang up" error — it reports the clearer "stopped by user"
+        // message instead.
+        let abortPoll;
+        if (abortSignal) {
+            abortPoll = setInterval(() => {
+                if (abortSignal.aborted && !settled) {
+                    selfAborted = true;
+                    req.destroy();
+                    finish({ error: 'Request stopped by user', interrupted: true });
+                }
+            }, 100);
+        }
         const req = transport.get(url, {
             timeout: DEFAULT_TIMEOUT_MS,
             lookup: guardedLookup,
@@ -1699,7 +1719,7 @@ async function fetchUrl(input, _workDir, _redirectCount = 0) {
                     finish({ error: `Invalid redirect location: ${res.headers.location}` });
                     return;
                 }
-                fetchUrl({ url: nextUrl }, undefined, _redirectCount + 1).then(finish);
+                fetchUrl({ url: nextUrl }, undefined, _redirectCount + 1, abortSignal).then(finish);
                 return;
             }
             const contentType = res.headers['content-type'] ?? '';
@@ -2082,37 +2102,70 @@ const VALID_ASPECT_RATIOS = new Set(['1:1', '9:16', '16:9', '3:4', '4:3', '3:2',
 // Minimal HTTPS helpers (mirrors the Node built-in pattern used by fetchUrl above).
 // We avoid `node-fetch` here because executor.ts targets both Node 18+ (global fetch)
 // and older runtimes; using `https` directly is always safe.
-function _httpsPost(url, body, headers, timeoutMs = 30000) {
+//
+// `abortSignal` is optional and, like fetchUrl's, best-effort: it stops the CALLER
+// from waiting on the request (destroys the socket, rejects immediately) rather than
+// waiting out the full timeoutMs. Before this was added, generate_image (170s),
+// stock_photo, and web_search had NO abort wiring at all — Ctrl+C during any of them
+// set `abortSignal.aborted = true` but nothing here ever looked at it, so the only way
+// out was to wait for the request to finish or time out on its own.
+function _httpsPost(url, body, headers, timeoutMs = 30000, abortSignal) {
     return new Promise((resolve, reject) => {
         const u = new URL(url);
         const chunks = [];
+        let settled = false;
+        let abortPoll;
+        const done = (fn) => { if (settled)
+            return; settled = true; if (abortPoll)
+            clearInterval(abortPoll); fn(); };
         const req = https.request({ hostname: u.hostname, path: u.pathname + u.search, method: 'POST', headers: { ...headers, 'Content-Length': Buffer.byteLength(body) }, timeout: timeoutMs }, (res) => {
             res.on('data', (c) => chunks.push(c));
-            res.on('end', () => resolve({ status: res.statusCode ?? 0, body: Buffer.concat(chunks).toString('utf-8') }));
+            res.on('end', () => done(() => resolve({ status: res.statusCode ?? 0, body: Buffer.concat(chunks).toString('utf-8') })));
         });
-        req.on('timeout', () => { req.destroy(); reject(new Error(`Request timed out after ${timeoutMs}ms`)); });
-        req.on('error', reject);
+        req.on('timeout', () => { req.destroy(); done(() => reject(new Error(`Request timed out after ${timeoutMs}ms`))); });
+        req.on('error', (err) => done(() => reject(err)));
+        if (abortSignal) {
+            abortPoll = setInterval(() => {
+                if (abortSignal.aborted && !settled) {
+                    req.destroy();
+                    done(() => reject(Object.assign(new Error('Stopped by user'), { name: 'AbortError' })));
+                }
+            }, 100);
+        }
         req.write(body);
         req.end();
     });
 }
-function _httpsGet(url, headers, timeoutMs = 20000) {
+function _httpsGet(url, headers, timeoutMs = 20000, abortSignal) {
     return new Promise((resolve, reject) => {
         const u = new URL(url);
         const transport = u.protocol === 'https:' ? https : http;
         const chunks = [];
+        let settled = false;
+        let abortPoll;
+        const done = (fn) => { if (settled)
+            return; settled = true; if (abortPoll)
+            clearInterval(abortPoll); fn(); };
         const req = transport.get({ hostname: u.hostname, path: u.pathname + u.search, headers, timeout: timeoutMs }, (res) => {
             // Follow redirects once
             if ((res.statusCode === 301 || res.statusCode === 302 || res.statusCode === 307 || res.statusCode === 308) && res.headers.location) {
                 req.destroy();
-                _httpsGet(new URL(res.headers.location, url).href, headers, timeoutMs).then(resolve, reject);
+                done(() => { _httpsGet(new URL(res.headers.location, url).href, headers, timeoutMs, abortSignal).then(resolve, reject); });
                 return;
             }
             res.on('data', (c) => chunks.push(c));
-            res.on('end', () => resolve({ status: res.statusCode ?? 0, body: Buffer.concat(chunks), contentType: res.headers['content-type'] ?? '' }));
+            res.on('end', () => done(() => resolve({ status: res.statusCode ?? 0, body: Buffer.concat(chunks), contentType: res.headers['content-type'] ?? '' })));
         });
-        req.on('timeout', () => { req.destroy(); reject(new Error(`Download timed out after ${timeoutMs}ms`)); });
-        req.on('error', reject);
+        req.on('timeout', () => { req.destroy(); done(() => reject(new Error(`Download timed out after ${timeoutMs}ms`))); });
+        req.on('error', (err) => done(() => reject(err)));
+        if (abortSignal) {
+            abortPoll = setInterval(() => {
+                if (abortSignal.aborted && !settled) {
+                    req.destroy();
+                    done(() => reject(Object.assign(new Error('Stopped by user'), { name: 'AbortError' })));
+                }
+            }, 100);
+        }
     });
 }
 /**
@@ -2122,7 +2175,7 @@ function _httpsGet(url, headers, timeoutMs = 20000) {
  *
  * { prompt, path, aspect_ratio? }
  */
-async function generateImage(input, workDir) {
+async function generateImage(input, workDir, abortSignal) {
     const prompt = typeof input.prompt === 'string' ? input.prompt.trim() : '';
     const relPath = typeof input.path === 'string' ? input.path.trim() : '';
     const aspectRatio = typeof input.aspect_ratio === 'string' && VALID_ASPECT_RATIOS.has(input.aspect_ratio)
@@ -2135,12 +2188,14 @@ async function generateImage(input, workDir) {
     if (!token)
         return { error: 'Not authenticated. Run `nexrall-code login` first.' };
     // 1. Request the backend to generate the image (async task + poll handled server-side).
-    //    Backend may take up to ~2.5 min — use a 170s timeout with room to spare.
+    //    Backend may take up to ~2.5 min — use a 170s timeout with room to spare. Without
+    //    abortSignal wired through here, Ctrl+C during this call previously had no effect
+    //    for up to the full 170s — the longest silent Ctrl+C stall of any tool.
     let imageUrl;
     let cost;
     let balance;
     try {
-        const r = await _httpsPost(`${client_1.API_BASE}/api/code/assets/generate`, JSON.stringify({ prompt, aspect_ratio: aspectRatio }), { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` }, 170000);
+        const r = await _httpsPost(`${client_1.API_BASE}/api/code/assets/generate`, JSON.stringify({ prompt, aspect_ratio: aspectRatio }), { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` }, 170000, abortSignal);
         let json = {};
         try {
             json = JSON.parse(r.body);
@@ -2155,6 +2210,8 @@ async function generateImage(input, workDir) {
             return { error: 'Image generation succeeded but no URL was returned.' };
     }
     catch (err) {
+        if (err.name === 'AbortError')
+            return { error: 'generate_image stopped by user', interrupted: true };
         return { error: `generate_image failed: ${err.message}` };
     }
     // 2. Download the image URL into the workspace.
@@ -2164,7 +2221,7 @@ async function generateImage(input, workDir) {
     }
     catch (_) { }
     try {
-        const dl = await _httpsGet(imageUrl, { 'User-Agent': FETCH_USER_AGENT }, 60000);
+        const dl = await _httpsGet(imageUrl, { 'User-Agent': FETCH_USER_AGENT }, 60000, abortSignal);
         if (dl.status !== 200)
             return { error: `Failed to download generated image (HTTP ${dl.status}).` };
         fs.writeFileSync(destPath, dl.body);
@@ -2173,6 +2230,8 @@ async function generateImage(input, workDir) {
         return { output: `Generated and saved image to ${destPath} (${kb} KB)${costNote}.` };
     }
     catch (err) {
+        if (err.name === 'AbortError')
+            return { error: 'generate_image stopped by user (image was generated and billed, but the download was interrupted)', interrupted: true };
         return { error: `Failed to save image to ${destPath}: ${err.message}` };
     }
 }
@@ -2182,7 +2241,7 @@ async function generateImage(input, workDir) {
  *
  * { query, path?, count?, orientation? }
  */
-async function stockPhoto(input, workDir) {
+async function stockPhoto(input, workDir, abortSignal) {
     const query = typeof input.query === 'string' ? input.query.trim() : '';
     const relPath = typeof input.path === 'string' ? input.path.trim() : '';
     const count = typeof input.count === 'number' ? Math.min(Math.max(Math.floor(input.count), 1), 10) : 3;
@@ -2200,7 +2259,7 @@ async function stockPhoto(input, workDir) {
         u.searchParams.set('count', String(count));
         if (orientation)
             u.searchParams.set('orientation', orientation);
-        const r = await _httpsGet(u.toString(), { Authorization: `Bearer ${token}` });
+        const r = await _httpsGet(u.toString(), { Authorization: `Bearer ${token}` }, 20000, abortSignal);
         let json = {};
         try {
             json = JSON.parse(r.body.toString('utf-8'));
@@ -2213,6 +2272,8 @@ async function stockPhoto(input, workDir) {
             return { output: `No stock photos found for "${query}".` };
     }
     catch (err) {
+        if (err.name === 'AbortError')
+            return { error: 'stock_photo stopped by user', interrupted: true };
         return { error: `stock_photo search failed: ${err.message}` };
     }
     // 2a. If path given — download the top result into the workspace.
@@ -2226,7 +2287,7 @@ async function stockPhoto(input, workDir) {
         }
         catch (_) { }
         try {
-            const dl = await _httpsGet(top.url, { 'User-Agent': FETCH_USER_AGENT });
+            const dl = await _httpsGet(top.url, { 'User-Agent': FETCH_USER_AGENT }, 20000, abortSignal);
             if (dl.status !== 200)
                 return { error: `Failed to download photo (HTTP ${dl.status}).` };
             fs.writeFileSync(destPath, dl.body);
@@ -2235,6 +2296,8 @@ async function stockPhoto(input, workDir) {
             return { output: `Downloaded "${top.alt || query}" to ${destPath} (${kb} KB).${credit}` };
         }
         catch (err) {
+            if (err.name === 'AbortError')
+                return { error: 'stock_photo download stopped by user', interrupted: true };
             return { error: `Failed to save photo to ${destPath}: ${err.message}` };
         }
     }
@@ -2259,7 +2322,7 @@ async function stockPhoto(input, workDir) {
  *
  * { query }
  */
-async function webSearch(input) {
+async function webSearch(input, _workDir, abortSignal) {
     const query = typeof input.query === 'string' ? input.query.trim() : '';
     if (!query)
         return { error: 'Missing required parameter: query' };
@@ -2267,7 +2330,7 @@ async function webSearch(input) {
     if (!token)
         return { error: 'Not authenticated. Run `nexrall-code login` first.' };
     try {
-        const r = await _httpsPost(`${client_1.API_BASE}/api/code/tools/web_search`, JSON.stringify({ query }), { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` }, 30000);
+        const r = await _httpsPost(`${client_1.API_BASE}/api/code/tools/web_search`, JSON.stringify({ query }), { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` }, 30000, abortSignal);
         let json = {};
         try {
             json = JSON.parse(r.body);
@@ -2281,6 +2344,8 @@ async function webSearch(input) {
         return { output: text };
     }
     catch (err) {
+        if (err.name === 'AbortError')
+            return { error: 'web_search stopped by user', interrupted: true };
         return { error: `web_search failed: ${err.message}` };
     }
 }
@@ -2415,11 +2480,13 @@ const TOOL_MAP = {
 };
 // Tools that accept a workDir for correct relative-path resolution.
 // TOOL_MAP stores the base signatures; executeTool injects workDir at call time.
+// generate_image / stock_photo used to be listed here, but now go through
+// their own dedicated branch above (which passes abortSignal too) — kept out
+// of this set so there's exactly one dispatch path per tool, not two.
 const WORKDIR_TOOLS = new Set([
     'read_file', 'write_file', 'list_directory', 'search_files', 'glob',
     'create_directory', 'edit_file', 'multi_edit', 'copy_file', 'move_file',
     'delete_file', 'notebook_read', 'notebook_edit',
-    'generate_image', 'stock_photo',
     'get_symbols', 'get_workspace_symbols',
     'go_to_definition', 'find_references', 'get_hover',
     'memory_write', 'memory_read', 'use_skill',
@@ -2439,6 +2506,19 @@ async function executeTool(name, input, abortSignal, sandbox, workDir, agentScop
             return await todoWrite(input, agentScope);
         if (name === 'todo_read')
             return await todoRead(input, agentScope);
+        // Network-bound tools get abortSignal explicitly (not through the generic
+        // WORKDIR_TOOLS branch below, whose signature is (input, workDir) only) —
+        // these are the tools that previously had NO way to stop early on Ctrl+C,
+        // silently making the user wait out their own timeout (up to 170s for
+        // generate_image) instead of returning control immediately.
+        if (name === 'fetch_url')
+            return await fetchUrl(input, workDir, 0, abortSignal);
+        if (name === 'web_search')
+            return await webSearch(input, workDir, abortSignal);
+        if (name === 'generate_image')
+            return await generateImage(input, workDir, abortSignal);
+        if (name === 'stock_photo')
+            return await stockPhoto(input, workDir, abortSignal);
         // Inject workDir into all file-system tools so relative paths resolve
         // against the workspace root rather than process.cwd().
         if (WORKDIR_TOOLS.has(name)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrall/code-core",
-  "version": "1.4.44",
+  "version": "1.4.46",
   "description": "Core agent loop, tools, and extension primitives for Nexrall Code — embed an AI coding agent in any Node.js application.",
   "license": "MIT",
   "author": "Nexrall <support@nexrall.com> (https://nexrall.com)",