@umsai/ums-code 0.3.0-v2 → 0.5.0-v1

package/dist/src/i18n/locales/zh.js

@@ -108,7 +108,6 @@ export default {
     '在浏览器中打开完整的 UMS Code 文档',
   'Configuration not available.': '配置不可用',
   'change the auth method': '更改认证方法',
-  'Show quit confirmation dialog': '显示退出确认对话框',
   'Copy the last result or code snippet to clipboard':
     '将最后的结果或代码片段复制到剪贴板',
 
@@ -655,15 +654,6 @@ export default {
   'A custom command wants to run the following shell commands:':
     '自定义命令想要运行以下 shell 命令：',
 
-  // ============================================================================
-  // Dialogs - Quit Confirmation
-  // ============================================================================
-  'What would you like to do before exiting?': '退出前您想要做什么？',
-  'Quit immediately (/quit)': '立即退出 (/quit)',
-  'Generate summary and quit (/summary)': '生成摘要并退出 (/summary)',
-  'Save conversation and quit (/chat save)': '保存对话并退出 (/chat save)',
-  'Cancel (stay in application)': '取消（留在应用程序中）',
-
   // ============================================================================
   // Dialogs - Pro Quota
   // ============================================================================
@@ -830,6 +820,7 @@ export default {
   // Exit Screen / Stats
   // ============================================================================
   'Agent powering down. Goodbye!': 'UMS Code 正在关闭，再见！',
+  'To continue this session, run': '要继续此会话，请运行',
   'Interaction Summary': '交互摘要',
   'Session ID:': '会话 ID：',
   'Tool Calls:': '工具调用：',

package/dist/src/nonInteractive/control/ControlDispatcher.d.ts

@@ -15,15 +15,20 @@
  * Controllers:
  * - SystemController: initialize, interrupt, set_model, supported_commands
  * - PermissionController: can_use_tool, set_permission_mode
- * - MCPController: mcp_message, mcp_server_status
+ * - SdkMcpController: mcp_server_status (mcp_message handled via callback)
  * - HookController: hook_callback
  *
+ * Note: mcp_message requests are NOT routed through the dispatcher. CLI MCP
+ * clients send messages via SdkMcpController.createSendSdkMcpMessage() callback.
+ *
  * Note: Control request types are centrally defined in the ControlRequestType
  * enum in packages/sdk/typescript/src/types/controlRequests.ts
  */
 import type { IControlContext } from './ControlContext.js';
 import type { IPendingRequestRegistry } from './controllers/baseController.js';
 import { SystemController } from './controllers/systemController.js';
+import { PermissionController } from './controllers/permissionController.js';
+import { SdkMcpController } from './controllers/sdkMcpController.js';
 import type { CLIControlRequest, CLIControlResponse, ControlResponse, ControlRequestPayload } from '../types.js';
 /**
  * Central coordinator for control plane communication.
@@ -32,6 +37,8 @@ import type { CLIControlRequest, CLIControlResponse, ControlResponse, ControlReq
 export declare class ControlDispatcher implements IPendingRequestRegistry {
     private context;
     readonly systemController: SystemController;
+    readonly permissionController: PermissionController;
+    readonly sdkMcpController: SdkMcpController;
     private pendingIncomingRequests;
     private pendingOutgoingRequests;
     constructor(context: IControlContext);
@@ -71,6 +78,22 @@ export declare class ControlDispatcher implements IPendingRequestRegistry {
      * Removes an outgoing request from the pending registry
      */
     deregisterOutgoingRequest(requestId: string): void;
+    /**
+     * Get count of pending incoming requests (for debugging)
+     */
+    getPendingIncomingRequestCount(): number;
+    /**
+     * Wait for all incoming request handlers to complete.
+     *
+     * Uses polling since we don't have direct Promise references to handlers.
+     * The pendingIncomingRequests map is managed by BaseController:
+     * - Registered when handler starts (in handleRequest)
+     * - Deregistered when handler completes (success or error)
+     *
+     * @param pollIntervalMs - How often to check (default 50ms)
+     * @param timeoutMs - Maximum wait time (default 30s)
+     */
+    waitForPendingIncomingRequests(pollIntervalMs?: number, timeoutMs?: number): Promise<void>;
     /**
      * Returns the controller that handles the given request subtype
      */

package/dist/src/nonInteractive/control/ControlDispatcher.js

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { SystemController } from './controllers/systemController.js';
+import { PermissionController } from './controllers/permissionController.js';
+import { SdkMcpController } from './controllers/sdkMcpController.js';
 /**
  * Central coordinator for control plane communication.
  * Routes requests to controllers and manages request lifecycle.
@@ -12,8 +14,8 @@ export class ControlDispatcher {
     context;
     // Make controllers publicly accessible
     systemController;
-    // readonly permissionController: PermissionController;
-    // readonly mcpController: MCPController;
+    permissionController;
+    sdkMcpController;
     // readonly hookController: HookController;
     // Central pending request registries
     pendingIncomingRequests = new Map();
@@ -22,12 +24,8 @@ export class ControlDispatcher {
         this.context = context;
         // Create domain controllers with context and registry
         this.systemController = new SystemController(context, this, 'SystemController');
-        // this.permissionController = new PermissionController(
-        //   context,
-        //   this,
-        //   'PermissionController',
-        // );
-        // this.mcpController = new MCPController(context, this, 'MCPController');
+        this.permissionController = new PermissionController(context, this, 'PermissionController');
+        this.sdkMcpController = new SdkMcpController(context, this, 'SdkMcpController');
         // this.hookController = new HookController(context, this, 'HookController');
         // Listen for main abort signal
         this.context.abortSignal.addEventListener('abort', () => {
@@ -137,10 +135,10 @@ export class ControlDispatcher {
             pending.reject(new Error('Dispatcher shutdown'));
         }
         this.pendingOutgoingRequests.clear();
-        // Cleanup controllers (MCP controller will close all clients)
+        // Cleanup controllers
         this.systemController.cleanup();
-        // this.permissionController.cleanup();
-        // this.mcpController.cleanup();
+        this.permissionController.cleanup();
+        this.sdkMcpController.cleanup();
         // this.hookController.cleanup();
     }
     /**
@@ -184,6 +182,38 @@ export class ControlDispatcher {
             this.pendingOutgoingRequests.delete(requestId);
         }
     }
+    /**
+     * Get count of pending incoming requests (for debugging)
+     */
+    getPendingIncomingRequestCount() {
+        return this.pendingIncomingRequests.size;
+    }
+    /**
+     * Wait for all incoming request handlers to complete.
+     *
+     * Uses polling since we don't have direct Promise references to handlers.
+     * The pendingIncomingRequests map is managed by BaseController:
+     * - Registered when handler starts (in handleRequest)
+     * - Deregistered when handler completes (success or error)
+     *
+     * @param pollIntervalMs - How often to check (default 50ms)
+     * @param timeoutMs - Maximum wait time (default 30s)
+     */
+    async waitForPendingIncomingRequests(pollIntervalMs = 50, timeoutMs = 30000) {
+        const startTime = Date.now();
+        while (this.pendingIncomingRequests.size > 0) {
+            if (Date.now() - startTime > timeoutMs) {
+                if (this.context.debugMode) {
+                    console.error(`[ControlDispatcher] Timeout waiting for ${this.pendingIncomingRequests.size} pending incoming requests`);
+                }
+                break;
+            }
+            await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+        }
+        if (this.context.debugMode && this.pendingIncomingRequests.size === 0) {
+            console.error('[ControlDispatcher] All incoming requests completed');
+        }
+    }
     /**
      * Returns the controller that handles the given request subtype
      */
@@ -194,12 +224,11 @@ export class ControlDispatcher {
             case 'set_model':
             case 'supported_commands':
                 return this.systemController;
-            // case 'can_use_tool':
-            // case 'set_permission_mode':
-            //   return this.permissionController;
-            // case 'mcp_message':
-            // case 'mcp_server_status':
-            //   return this.mcpController;
+            case 'can_use_tool':
+            case 'set_permission_mode':
+                return this.permissionController;
+            case 'mcp_server_status':
+                return this.sdkMcpController;
             // case 'hook_callback':
             //   return this.hookController;
             default:

package/dist/src/nonInteractive/control/ControlDispatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"ControlDispatcher.js","sourceRoot":"","sources":["../../../../src/nonInteractive/control/ControlDispatcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ControlDispatcher.js","sourceRoot":"","sources":["../../../../src/nonInteractive/control/ControlDispatcher.ts"],"names":[],"mappings":"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"}

package/dist/src/nonInteractive/control/ControlService.d.ts

@@ -26,7 +26,7 @@
  */
 import type { IControlContext } from './ControlContext.js';
 import type { ControlDispatcher } from './ControlDispatcher.js';
-import type { SystemServiceAPI } from './types/serviceAPIs.js';
+import type { PermissionServiceAPI, SystemServiceAPI } from './types/serviceAPIs.js';
 /**
  * Control Service
  *
@@ -49,6 +49,7 @@ export declare class ControlService {
      * Handles tool execution permissions, approval checks, and callbacks.
      * Delegates to the shared PermissionController instance.
      */
+    get permission(): PermissionServiceAPI;
     /**
      * System Domain API
      *

package/dist/src/nonInteractive/control/ControlService.js

@@ -27,43 +27,28 @@ export class ControlService {
      * Handles tool execution permissions, approval checks, and callbacks.
      * Delegates to the shared PermissionController instance.
      */
-    // get permission(): PermissionServiceAPI {
-    //   const controller = this.dispatcher.permissionController;
-    //   return {
-    //     /**
-    //      * Check if a tool should be allowed based on current permission settings
-    //      *
-    //      * Evaluates permission mode and tool registry to determine if execution
-    //      * should proceed. Can optionally modify tool arguments based on confirmation details.
-    //      *
-    //      * @param toolRequest - Tool call request information
-    //      * @param confirmationDetails - Optional confirmation details for UI
-    //      * @returns Permission decision with optional updated arguments
-    //      */
-    //     shouldAllowTool: controller.shouldAllowTool.bind(controller),
-    //
-    //     /**
-    //      * Build UI suggestions for tool confirmation dialogs
-    //      *
-    //      * Creates actionable permission suggestions based on tool confirmation details.
-    //      *
-    //      * @param confirmationDetails - Tool confirmation details
-    //      * @returns Array of permission suggestions or null
-    //      */
-    //     buildPermissionSuggestions:
-    //       controller.buildPermissionSuggestions.bind(controller),
-    //
-    //     /**
-    //      * Get callback for monitoring tool call status updates
-    //      *
-    //      * Returns callback function for integration with CoreToolScheduler.
-    //      *
-    //      * @returns Callback function for tool call updates
-    //      */
-    //     getToolCallUpdateCallback:
-    //       controller.getToolCallUpdateCallback.bind(controller),
-    //   };
-    // }
+    get permission() {
+        const controller = this.dispatcher.permissionController;
+        return {
+            /**
+             * Build UI suggestions for tool confirmation dialogs
+             *
+             * Creates actionable permission suggestions based on tool confirmation details.
+             *
+             * @param confirmationDetails - Tool confirmation details
+             * @returns Array of permission suggestions or null
+             */
+            buildPermissionSuggestions: controller.buildPermissionSuggestions.bind(controller),
+            /**
+             * Get callback for monitoring tool call status updates
+             *
+             * Returns callback function for integration with CoreToolScheduler.
+             *
+             * @returns Callback function for tool call updates
+             */
+            getToolCallUpdateCallback: controller.getToolCallUpdateCallback.bind(controller),
+        };
+    }
     /**
      * System Domain API
      *

package/dist/src/nonInteractive/control/ControlService.js.map

@@ -1 +1 @@
-{"version":3,"file":"ControlService.js","sourceRoot":"","sources":["../../../../src/nonInteractive/control/ControlService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAiCH;;;;;;GAMG;AACH,MAAM,OAAO,cAAc;IACjB,UAAU,CAAoB;IAEtC;;;;;OAKG;IACH,YAAY,OAAwB,EAAE,UAA6B;QACjE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED;;;;;OAKG;IACH,2CAA2C;IAC3C,6DAA6D;IAC7D,aAAa;IACb,UAAU;IACV,gFAAgF;IAChF,SAAS;IACT,+EAA+E;IAC/E,6FAA6F;IAC7F,SAAS;IACT,4DAA4D;IAC5D,2EAA2E;IAC3E,sEAAsE;IACtE,UAAU;IACV,oEAAoE;IACpE,EAAE;IACF,UAAU;IACV,4DAA4D;IAC5D,SAAS;IACT,uFAAuF;IACvF,SAAS;IACT,gEAAgE;IAChE,0DAA0D;IAC1D,UAAU;IACV,kCAAkC;IAClC,gEAAgE;IAChE,EAAE;IACF,UAAU;IACV,8DAA8D;IAC9D,SAAS;IACT,2EAA2E;IAC3E,SAAS;IACT,0DAA0D;IAC1D,UAAU;IACV,iCAAiC;IACjC,+DAA+D;IAC/D,OAAO;IACP,IAAI;IAEJ;;;;;OAKG;IACH,IAAI,MAAM;QACR,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC;QACpD,OAAO;YACL;;;;;;;;eAQG;YACH,sBAAsB,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,wBAAwB,EAAE;SACpE,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,6BAA6B;IAC7B,aAAa;IACb,UAAU;IACV,qEAAqE;IACrE,SAAS;IACT,4DAA4D;IAC5D,SAAS;IACT,oDAAoD;IACpD,iDAAiD;IACjD,UAAU;IACV,oDAAoD;IACpD,mEAAmE;IACnE,4CAA4C;IAC5C,+CAA+C;IAC/C,gFAAgF;IAChF,yBAAyB;IACzB,uFAAuF;IACvF,WAAW;IACX,SAAS;IACT,EAAE;IACF,UAAU;IACV,wCAAwC;IACxC,SAAS;IACT,4DAA4D;IAC5D,SAAS;IACT,wCAAwC;IACxC,UAAU;IACV,2BAA2B;IAC3B,oCAAoC;IACpC,uCAAuC;IACvC,kEAAkE;IAClE,WAAW;IACX,uCAAuC;IACvC,sEAAsE;IACtE,WAAW;IACX,6DAA6D;IAC7D,SAAS;IACT,OAAO;IACP,IAAI;IAEJ;;;;;OAKG;IACH,+BAA+B;IAC/B,4FAA4F;IAC5F,eAAe;IACf,IAAI;IAEJ;;;;;OAKG;IACH,OAAO;QACL,0DAA0D;QAC1D,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;CACF"}
+{"version":3,"file":"ControlService.js","sourceRoot":"","sources":["../../../../src/nonInteractive/control/ControlService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAiCH;;;;;;GAMG;AACH,MAAM,OAAO,cAAc;IACjB,UAAU,CAAoB;IAEtC;;;;;OAKG;IACH,YAAY,OAAwB,EAAE,UAA6B;QACjE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED;;;;;OAKG;IACH,IAAI,UAAU;QACZ,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC;QACxD,OAAO;YACL;;;;;;;eAOG;YACH,0BAA0B,EACxB,UAAU,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC;YAExD;;;;;;eAMG;YACH,yBAAyB,EACvB,UAAU,CAAC,yBAAyB,CAAC,IAAI,CAAC,UAAU,CAAC;SACxD,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,IAAI,MAAM;QACR,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC;QACpD,OAAO;YACL;;;;;;;;eAQG;YACH,sBAAsB,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,wBAAwB,EAAE;SACpE,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,6BAA6B;IAC7B,aAAa;IACb,UAAU;IACV,qEAAqE;IACrE,SAAS;IACT,4DAA4D;IAC5D,SAAS;IACT,oDAAoD;IACpD,iDAAiD;IACjD,UAAU;IACV,oDAAoD;IACpD,mEAAmE;IACnE,4CAA4C;IAC5C,+CAA+C;IAC/C,gFAAgF;IAChF,yBAAyB;IACzB,uFAAuF;IACvF,WAAW;IACX,SAAS;IACT,EAAE;IACF,UAAU;IACV,wCAAwC;IACxC,SAAS;IACT,4DAA4D;IAC5D,SAAS;IACT,wCAAwC;IACxC,UAAU;IACV,2BAA2B;IAC3B,oCAAoC;IACpC,uCAAuC;IACvC,kEAAkE;IAClE,WAAW;IACX,uCAAuC;IACvC,sEAAsE;IACtE,WAAW;IACX,6DAA6D;IAC7D,SAAS;IACT,OAAO;IACP,IAAI;IAEJ;;;;;OAKG;IACH,+BAA+B;IAC/B,4FAA4F;IAC5F,eAAe;IACf,IAAI;IAEJ;;;;;OAKG;IACH,OAAO;QACL,0DAA0D;QAC1D,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;CACF"}

package/dist/src/nonInteractive/control/controllers/baseController.d.ts

@@ -35,8 +35,9 @@ export declare abstract class BaseController {
      * Send an outgoing control request to SDK
      *
      * Manages lifecycle: register -> send -> wait for response -> deregister
+     * Respects the provided AbortSignal for cancellation.
      */
-    sendControlRequest(payload: ControlRequestPayload, timeoutMs?: number): Promise<ControlResponse>;
+    sendControlRequest(payload: ControlRequestPayload, timeoutMs?: number, signal?: AbortSignal): Promise<ControlResponse>;
     /**
      * Abstract method: Handle specific request payload
      *

package/dist/src/nonInteractive/control/controllers/baseController.js

@@ -63,20 +63,52 @@ export class BaseController {
      * Send an outgoing control request to SDK
      *
      * Manages lifecycle: register -> send -> wait for response -> deregister
+     * Respects the provided AbortSignal for cancellation.
      */
-    async sendControlRequest(payload, timeoutMs = DEFAULT_REQUEST_TIMEOUT_MS) {
+    async sendControlRequest(payload, timeoutMs = DEFAULT_REQUEST_TIMEOUT_MS, signal) {
+        // Check if already aborted
+        if (signal?.aborted) {
+            throw new Error('Request aborted');
+        }
         const requestId = randomUUID();
         return new Promise((resolve, reject) => {
+            // Setup abort handler
+            const abortHandler = () => {
+                this.registry.deregisterOutgoingRequest(requestId);
+                reject(new Error('Request aborted'));
+                if (this.context.debugMode) {
+                    console.error(`[${this.controllerName}] Outgoing request aborted: ${requestId}`);
+                }
+            };
+            if (signal) {
+                signal.addEventListener('abort', abortHandler, { once: true });
+            }
             // Setup timeout
             const timeoutId = setTimeout(() => {
+                if (signal) {
+                    signal.removeEventListener('abort', abortHandler);
+                }
                 this.registry.deregisterOutgoingRequest(requestId);
                 reject(new Error('Control request timeout'));
                 if (this.context.debugMode) {
                     console.error(`[${this.controllerName}] Outgoing request timeout: ${requestId}`);
                 }
             }, timeoutMs);
+            // Wrap resolve/reject to clean up abort listener
+            const wrappedResolve = (response) => {
+                if (signal) {
+                    signal.removeEventListener('abort', abortHandler);
+                }
+                resolve(response);
+            };
+            const wrappedReject = (error) => {
+                if (signal) {
+                    signal.removeEventListener('abort', abortHandler);
+                }
+                reject(error);
+            };
             // Register with central registry
-            this.registry.registerOutgoingRequest(requestId, this.controllerName, resolve, reject, timeoutId);
+            this.registry.registerOutgoingRequest(requestId, this.controllerName, wrappedResolve, wrappedReject, timeoutId);
             // Send control request
             const request = {
                 type: 'control_request',
@@ -87,6 +119,9 @@ export class BaseController {
                 this.context.streamJson.send(request);
             }
             catch (error) {
+                if (signal) {
+                    signal.removeEventListener('abort', abortHandler);
+                }
                 this.registry.deregisterOutgoingRequest(requestId);
                 reject(error);
             }
@@ -95,8 +130,6 @@ export class BaseController {
     /**
      * Cleanup resources
      */
-    cleanup() {
-        // Subclasses can override to add cleanup logic
-    }
+    cleanup() { }
 }
 //# sourceMappingURL=baseController.js.map

package/dist/src/nonInteractive/control/controllers/baseController.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseController.js","sourceRoot":"","sources":["../../../../../src/nonInteractive/control/controllers/baseController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"baseController.js","sourceRoot":"","sources":["../../../../../src/nonInteractive/control/controllers/baseController.ts"],"names":[],"mappings":"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"}

package/dist/src/nonInteractive/control/controllers/permissionController.d.ts

@@ -3,16 +3,6 @@
  * Copyright 2025 Qwen Team
  * SPDX-License-Identifier: Apache-2.0
  */
-/**
- * Permission Controller
- *
- * Handles permission-related control requests:
- * - can_use_tool: Check if tool usage is allowed
- * - set_permission_mode: Change permission mode at runtime
- *
- * Abstracts all permission logic from the session manager to keep it clean.
- */
-import type { ToolCallRequestInfo } from '@umsai/ums-code-core';
 import type { ControlRequestPayload, PermissionSuggestion } from '../../types.js';
 import { BaseController } from './baseController.js';
 export declare class PermissionController extends BaseController {
@@ -20,7 +10,7 @@ export declare class PermissionController extends BaseController {
     /**
      * Handle permission control requests
      */
-    protected handleRequestPayload(payload: ControlRequestPayload, _signal: AbortSignal): Promise<Record<string, unknown>>;
+    protected handleRequestPayload(payload: ControlRequestPayload, signal: AbortSignal): Promise<Record<string, unknown>>;
     /**
      * Handle can_use_tool request
      *
@@ -51,17 +41,6 @@ export declare class PermissionController extends BaseController {
      * helping the host application present appropriate permission options.
      */
     buildPermissionSuggestions(confirmationDetails: unknown): PermissionSuggestion[] | null;
-    /**
-     * Check if a tool should be executed based on current permission settings
-     *
-     * This is a convenience method for direct tool execution checks without
-     * going through the control request flow.
-     */
-    shouldAllowTool(toolRequest: ToolCallRequestInfo, confirmationDetails?: unknown): Promise<{
-        allowed: boolean;
-        message?: string;
-        updatedArgs?: Record<string, unknown>;
-    }>;
     /**
      * Get callback for monitoring tool calls and handling outgoing permission requests
      * This is passed to executeToolCall to hook into CoreToolScheduler updates

package/dist/src/nonInteractive/control/controllers/permissionController.js

@@ -10,12 +10,15 @@ export class PermissionController extends BaseController {
     /**
      * Handle permission control requests
      */
-    async handleRequestPayload(payload, _signal) {
+    async handleRequestPayload(payload, signal) {
+        if (signal.aborted) {
+            throw new Error('Request aborted');
+        }
         switch (payload.subtype) {
             case 'can_use_tool':
-                return this.handleCanUseTool(payload);
+                return this.handleCanUseTool(payload, signal);
             case 'set_permission_mode':
-                return this.handleSetPermissionMode(payload);
+                return this.handleSetPermissionMode(payload, signal);
             default:
                 throw new Error(`Unsupported request subtype in PermissionController`);
         }
@@ -28,7 +31,10 @@ export class PermissionController extends BaseController {
      * - Tool registry validation
      * - Error handling with safe defaults
      */
-    async handleCanUseTool(payload) {
+    async handleCanUseTool(payload, signal) {
+        if (signal.aborted) {
+            throw new Error('Request aborted');
+        }
         const toolName = payload.tool_name;
         if (!toolName ||
             typeof toolName !== 'string' ||
@@ -125,7 +131,10 @@ export class PermissionController extends BaseController {
      *
      * Updates the permission mode in the context
      */
-    async handleSetPermissionMode(payload) {
+    async handleSetPermissionMode(payload, signal) {
+        if (signal.aborted) {
+            throw new Error('Request aborted');
+        }
         const mode = payload.mode;
         const validModes = [
             'default',
@@ -137,6 +146,7 @@ export class PermissionController extends BaseController {
             throw new Error(`Invalid permission mode: ${mode}. Valid values are: ${validModes.join(', ')}`);
         }
         this.context.permissionMode = mode;
+        this.context.config.setApprovalMode(mode);
         if (this.context.debugMode) {
             console.error(`[PermissionController] Permission mode updated to: ${mode}`);
         }
@@ -246,36 +256,6 @@ export class PermissionController extends BaseController {
                 ];
         }
     }
-    /**
-     * Check if a tool should be executed based on current permission settings
-     *
-     * This is a convenience method for direct tool execution checks without
-     * going through the control request flow.
-     */
-    async shouldAllowTool(toolRequest, confirmationDetails) {
-        // Check permission mode
-        const modeResult = this.checkPermissionMode();
-        if (!modeResult.allowed) {
-            return {
-                allowed: false,
-                message: modeResult.message,
-            };
-        }
-        // Check tool registry
-        const registryResult = this.checkToolRegistry(toolRequest.name);
-        if (!registryResult.allowed) {
-            return {
-                allowed: false,
-                message: registryResult.message,
-            };
-        }
-        // If we have confirmation details, we could potentially modify args
-        // This is a hook for future enhancement
-        if (confirmationDetails) {
-            // Future: handle argument modifications based on confirmation details
-        }
-        return { allowed: true };
-    }
     /**
      * Get callback for monitoring tool calls and handling outgoing permission requests
      * This is passed to executeToolCall to hook into CoreToolScheduler updates
@@ -305,6 +285,11 @@ export class PermissionController extends BaseController {
      */
     async handleOutgoingPermissionRequest(toolCall) {
         try {
+            // Check if already aborted
+            if (this.context.abortSignal?.aborted) {
+                await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel);
+                return;
+            }
             const inputFormat = this.context.config.getInputFormat?.();
             const isStreamJsonMode = inputFormat === InputFormat.STREAM_JSON;
             if (!isStreamJsonMode) {
@@ -325,7 +310,8 @@ export class PermissionController extends BaseController {
                 input: toolCall.request.args,
                 permission_suggestions: permissionSuggestions,
                 blocked_path: null,
-            }, 30000);
+            }, undefined, // use default timeout
+            this.context.abortSignal);
             if (response.subtype !== 'success') {
                 await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel);
                 return;
@@ -341,14 +327,28 @@ export class PermissionController extends BaseController {
                 await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
             }
             else {
-                await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel);
+                // Extract cancel message from response if available
+                const cancelMessage = typeof payload['message'] === 'string'
+                    ? payload['message']
+                    : undefined;
+                await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel, cancelMessage ? { cancelMessage } : undefined);
             }
         }
         catch (error) {
             if (this.context.debugMode) {
                 console.error('[PermissionController] Outgoing permission failed:', error);
             }
-            await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel);
+            // On error, use default cancel message
+            // Only pass payload for exec and mcp types that support it
+            const confirmationType = toolCall.confirmationDetails.type;
+            if (['edit', 'exec', 'mcp'].includes(confirmationType)) {
+                const execOrMcpDetails = toolCall.confirmationDetails;
+                await execOrMcpDetails.onConfirm(ToolConfirmationOutcome.Cancel, undefined);
+            }
+            else {
+                // For other types, don't pass payload (backward compatible)
+                await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel);
+            }
         }
         finally {
             this.pendingOutgoingRequests.delete(toolCall.request.callId);