@tencent-ai/agent-sdk 0.3.147 → 0.3.150

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tencent-ai/codebuddy-code",
-  "version": "2.95.1",
+  "version": "2.97.0",
   "description": "Use CodeBuddy, Tencent's AI assistant, right from your terminal. CodeBuddy can understand your codebase, edit files, run terminal commands, and handle entire workflows for you.",
   "main": "lib/node/index.js",
   "typings": "lib/node/index.d.ts",

package/cli/product.cloudhosted.json

@@ -110,6 +110,9 @@
       "tools": [
         "Read"
       ],
+      "commands": [
+        "_compact"
+      ],
       "tags": [
         "cli",
         "compact"
@@ -407,8 +410,9 @@
     "DeferToolLoading": true,
     "ImageGen": true,
     "ScheduledTasks": true,
-    "SkillManage": false
+    "SkillManage": false,
+    "SelectImage": true
   },
-  "commit": "8e49c921711de49156059cd1c5e35e11e28423ba",
-  "date": "2026-05-07T12:47:07.850Z"
+  "commit": "128246570576896f27eea5952184b086b997c167",
+  "date": "2026-05-13T06:44:47.289Z"
 }

package/cli/product.internal.json

@@ -118,6 +118,9 @@
       "tools": [
         "Read"
       ],
+      "commands": [
+        "_compact"
+      ],
       "tags": [
         "cli",
         "compact"
@@ -594,6 +597,6 @@
       }
     }
   },
-  "commit": "8e49c921711de49156059cd1c5e35e11e28423ba",
-  "date": "2026-05-07T12:47:07.849Z"
+  "commit": "128246570576896f27eea5952184b086b997c167",
+  "date": "2026-05-13T06:44:47.289Z"
 }

package/cli/product.ioa.json

@@ -141,6 +141,9 @@
       "tools": [
         "Read"
       ],
+      "commands": [
+        "_compact"
+      ],
       "tags": [
         "cli",
         "compact"
@@ -945,6 +948,6 @@
       }
     }
   },
-  "commit": "8e49c921711de49156059cd1c5e35e11e28423ba",
-  "date": "2026-05-07T12:47:07.855Z"
+  "commit": "128246570576896f27eea5952184b086b997c167",
+  "date": "2026-05-13T06:44:47.278Z"
 }

package/cli/product.json

@@ -505,7 +505,7 @@
     },
     {
       "name": "terminal-title-generator-instructions",
-      "template": "You are a topic analyzer. Your ONLY purpose is to identify conversation topics.\n\nYour job:\n1. Read the user message\n2. Determine if it starts a NEW conversation topic (compared to previous context if any)\n3. If yes, extract a 2-3 word title for the topic\n\nCRITICAL CONSTRAINTS:\n- You are NOT a code generator, writer, or task executor\n- You MUST respond ONLY with JSON in this exact format:\n  {\"isNewTopic\": boolean, \"title\": string or null}\n- NEVER generate, implement, code, or produce any content\n- NEVER provide explanations, reasoning, or extra text\n- NEVER engage with the user's actual request beyond identifying the topic\n\nExamples:\nUser: \"Can you build an HTML5 game?\" → {\"isNewTopic\": true, \"title\": \"Game Development\"}\nUser: \"Add more features\" → {\"isNewTopic\": false, \"title\": null}\n\nReturn only the JSON object. Nothing else.\n"
+      "template": "You are a topic analyzer. Your ONLY purpose is to identify conversation topics.\n\nYour job:\n1. Read the user message\n2. Determine if it starts a NEW conversation topic (compared to previous context if any)\n3. If yes, extract a 2-3 word title for the topic\n\nCRITICAL CONSTRAINTS:\n- You are NOT a code generator, writer, or task executor\n- You MUST respond ONLY with JSON in this exact format:\n  {\"isNewTopic\": boolean, \"title\": string or null}\n- NEVER generate, implement, code, or produce any content\n- NEVER provide explanations, reasoning, or extra text\n- NEVER engage with the user's actual request beyond identifying the topic\n\nExamples:\nUser: \"Can you build an HTML5 game?\" → {\"isNewTopic\": true, \"title\": \"Game Development\"}\nUser: \"Add more features\" → {\"isNewTopic\": false, \"title\": null}\n\nReturn only the JSON object. Nothing else.\n{%- if language -%}\n\nIMPORTANT: The `title` field MUST be written in {{language}}. Do not use English for the title value even though these instructions are in English. The JSON structure itself (field names, boolean values) stays unchanged.\n{%- endif -%}\n"
     },
     {
       "name": "memory-selector-instructions",
@@ -945,6 +945,9 @@
       "tools": [
         "Read"
       ],
+      "commands": [
+        "_compact"
+      ],
       "tags": [
         "cli",
         "compact"
@@ -1128,6 +1131,11 @@
         "compact-agent"
       ]
     },
+    {
+      "name": "_compact",
+      "description": "Clear conversation history but keep a summary in context. Optional: /compact [instructions for summarization]",
+      "prompt": "compact-prompt"
+    },
     {
       "name": "upgrade",
       "description": "Open upgrade page in browser"
@@ -1519,6 +1527,6 @@
       "description": "Send a reply to a WeCom (企业微信) user. For text: pass text (markdown supported)."
     }
   ],
-  "commit": "8e49c921711de49156059cd1c5e35e11e28423ba",
-  "date": "2026-05-07T12:47:07.849Z"
+  "commit": "128246570576896f27eea5952184b086b997c167",
+  "date": "2026-05-13T06:44:47.294Z"
 }

package/cli/product.selfhosted.json

@@ -104,6 +104,9 @@
       "tools": [
         "Read"
       ],
+      "commands": [
+        "_compact"
+      ],
       "tags": [
         "cli",
         "compact"
@@ -296,6 +299,6 @@
     "DeferToolLoading": true,
     "ScheduledTasks": true
   },
-  "commit": "8e49c921711de49156059cd1c5e35e11e28423ba",
-  "date": "2026-05-07T12:47:07.850Z"
+  "commit": "128246570576896f27eea5952184b086b997c167",
+  "date": "2026-05-13T06:44:47.285Z"
 }

package/lib/_internal/query-controller.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Owns control protocol bookkeeping (initialize + hook/permission/mcp routing)
+ * shared by ``query()`` and ``createSession()``.
+ */
+import type { Transport } from '../transport';
+import type { AgentDefinition, CanUseTool, ControlInitializeRequest, ControlInitializeResponse, ControlRequest, HookCallbackMatcher, HookEvent } from '../types';
+export interface InitializePayloadOptions {
+    /** SDK-defined agent definitions (sent via initialize control_request) */
+    agents?: Record<string, AgentDefinition>;
+    /** Override the default system prompt (string), or append (object) */
+    systemPrompt?: string | {
+        append: string;
+    };
+    /** Predefined environment for selfhosted authentication */
+    environment?: ControlInitializeRequest['environment'];
+    /** Custom endpoint URL for selfhosted environment */
+    endpoint?: ControlInitializeRequest['endpoint'];
+    /** Whether a prompt is going to follow this initialize (controls history replay) */
+    hasPrompt: boolean;
+}
+export declare class QueryController {
+    private readonly transport;
+    private readonly canUseToolGetter;
+    private readonly abortSignalGetter;
+    private hookCallbacks;
+    private registeredHooks?;
+    constructor(transport: Transport, hooks: Partial<Record<HookEvent, HookCallbackMatcher[]>> | undefined, canUseToolGetter: () => CanUseTool | undefined, abortSignalGetter: () => AbortSignal);
+    initialize(opts: InitializePayloadOptions): Promise<ControlInitializeResponse>;
+    handleControlRequest(request: ControlRequest): Promise<void>;
+    private handlePermissionRequest;
+    private handleHookCallback;
+    /**
+     * Replace the registered hook callbacks. The hook event structure (events,
+     * matchers) was sent to CLI during initialize() — this just rewires the
+     * callback functions for existing hook IDs.
+     */
+    setHooks(hooks: Partial<Record<HookEvent, HookCallbackMatcher[]>> | undefined): void;
+    private registerHooks;
+    private buildHooksConfig;
+}
+//# sourceMappingURL=query-controller.d.ts.map

package/lib/_internal/query-controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-controller.d.ts","sourceRoot":"","sources":["../../src/_internal/query-controller.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EACR,eAAe,EACf,UAAU,EAEV,wBAAwB,EACxB,yBAAyB,EAEzB,cAAc,EACd,mBAAmB,EACnB,SAAS,EAKZ,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,wBAAwB;IACrC,0EAA0E;IAC1E,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACzC,sEAAsE;IACtE,YAAY,CAAC,EAAE,MAAM,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,2DAA2D;IAC3D,WAAW,CAAC,EAAE,wBAAwB,CAAC,aAAa,CAAC,CAAC;IACtD,qDAAqD;IACrD,QAAQ,CAAC,EAAE,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAChD,oFAAoF;IACpF,SAAS,EAAE,OAAO,CAAC;CACtB;AAED,qBAAa,eAAe;IAQpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAG1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAIjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAdtC,OAAO,CAAC,aAAa,CAGP;IACd,OAAO,CAAC,eAAe,CAAC,CAAoD;gBAGvD,SAAS,EAAE,SAAS,EACrC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,mBAAmB,EAAE,CAAC,CAAC,GAAG,SAAS,EAEnD,gBAAgB,EAAE,MAAM,UAAU,GAAG,SAAS,EAI9C,iBAAiB,EAAE,MAAM,WAAW;IAOnD,UAAU,CAAC,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,yBAAyB,CAAC;IA8B9E,oBAAoB,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;YAUpD,uBAAuB;YA4DvB,kBAAkB;IAsBhC;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,mBAAmB,EAAE,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI;IAMpF,OAAO,CAAC,aAAa;IAmBrB,OAAO,CAAC,gBAAgB;CAoB3B"}

package/lib/_internal/query-controller.js

@@ -0,0 +1,168 @@
+"use strict";
+/**
+ * Owns control protocol bookkeeping (initialize + hook/permission/mcp routing)
+ * shared by ``query()`` and ``createSession()``.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryController = void 0;
+class QueryController {
+    constructor(transport, hooks, 
+    // Lazy: Session may swap canUseTool at runtime via setCanUseTool().
+    canUseToolGetter, 
+    // Lazy: Session replaces its AbortController after an interrupt+continue cycle
+    // (see SessionImpl.send) — a captured reference would dispatch hook / canUseTool
+    // callbacks with a stale, already-aborted signal.
+    abortSignalGetter) {
+        this.transport = transport;
+        this.canUseToolGetter = canUseToolGetter;
+        this.abortSignalGetter = abortSignalGetter;
+        this.hookCallbacks = new Map();
+        this.registerHooks(hooks);
+    }
+    // ============= Initialize =============
+    async initialize(opts) {
+        const systemPrompt = typeof opts.systemPrompt === 'string'
+            ? opts.systemPrompt
+            : undefined;
+        const appendSystemPrompt = typeof opts.systemPrompt === 'object'
+            ? opts.systemPrompt.append
+            : undefined;
+        const sdkMcpServerNames = this.transport.sdkMcpServerNames;
+        const initRequest = {
+            subtype: 'initialize',
+            hooks: this.buildHooksConfig(),
+            systemPrompt,
+            appendSystemPrompt,
+            agents: opts.agents,
+            sdkMcpServers: sdkMcpServerNames.length > 0 ? sdkMcpServerNames : undefined,
+            environment: opts.environment,
+            endpoint: opts.endpoint,
+            capabilities: {
+                askUserQuestion: true,
+            },
+            hasPrompt: opts.hasPrompt,
+        };
+        return this.transport.sendControlRequest(initRequest);
+    }
+    // ============= Control request routing =============
+    async handleControlRequest(request) {
+        const { subtype } = request.request;
+        if (subtype === 'hook_callback') {
+            await this.handleHookCallback(request);
+        }
+        else if (subtype === 'can_use_tool') {
+            await this.handlePermissionRequest(request);
+        }
+        // mcp_message is handled at the transport level
+    }
+    async handlePermissionRequest(request) {
+        const permRequest = request.request;
+        const { tool_name, input, tool_use_id, agent_id, permission_suggestions, blocked_path, decision_reason, } = permRequest;
+        const canUseTool = this.canUseToolGetter();
+        if (!canUseTool) {
+            this.transport.sendControlResponse(request.request_id, {
+                allowed: false,
+                reason: 'No permission handler provided',
+                tool_use_id,
+            });
+            return;
+        }
+        try {
+            const result = await canUseTool(tool_name, input, {
+                signal: this.abortSignalGetter(),
+                suggestions: permission_suggestions,
+                blockedPath: blocked_path,
+                decisionReason: decision_reason,
+                toolUseID: tool_use_id,
+                agentID: agent_id,
+            });
+            if (result.behavior === 'allow') {
+                this.transport.sendControlResponse(request.request_id, {
+                    allowed: true,
+                    updatedInput: result.updatedInput,
+                    tool_use_id,
+                });
+            }
+            else {
+                this.transport.sendControlResponse(request.request_id, {
+                    allowed: false,
+                    reason: result.message,
+                    interrupt: result.interrupt,
+                    tool_use_id,
+                });
+            }
+        }
+        catch (error) {
+            this.transport.sendControlResponse(request.request_id, {
+                allowed: false,
+                reason: error instanceof Error ? error.message : String(error),
+                tool_use_id,
+            });
+        }
+    }
+    async handleHookCallback(request) {
+        const { callback_id, input, tool_use_id } = request.request;
+        const callback = this.hookCallbacks.get(callback_id);
+        let response = { continue: true };
+        if (callback) {
+            try {
+                response = await callback(input, tool_use_id, { signal: this.abortSignalGetter() });
+            }
+            catch (error) {
+                response = {
+                    continue: false,
+                    stopReason: error instanceof Error ? error.message : String(error),
+                };
+            }
+        }
+        this.transport.sendControlResponse(request.request_id, response);
+    }
+    // ============= Hooks =============
+    /**
+     * Replace the registered hook callbacks. The hook event structure (events,
+     * matchers) was sent to CLI during initialize() — this just rewires the
+     * callback functions for existing hook IDs.
+     */
+    setHooks(hooks) {
+        this.hookCallbacks.clear();
+        this.registeredHooks = undefined;
+        this.registerHooks(hooks);
+    }
+    registerHooks(hooks) {
+        if (!hooks) {
+            return;
+        }
+        this.registeredHooks = hooks;
+        for (const [event, matchers] of Object.entries(hooks)) {
+            if (!matchers) {
+                continue;
+            }
+            matchers.forEach((matcher, matcherIndex) => {
+                matcher.hooks.forEach((hook, hookIndex) => {
+                    const callbackId = `hook_${event}_${matcherIndex}_${hookIndex}`;
+                    this.hookCallbacks.set(callbackId, hook);
+                });
+            });
+        }
+    }
+    buildHooksConfig() {
+        if (!this.registeredHooks) {
+            return undefined;
+        }
+        const config = {};
+        for (const [event, matchers] of Object.entries(this.registeredHooks)) {
+            if (!matchers) {
+                continue;
+            }
+            const hookEvent = event;
+            config[hookEvent] = matchers.map((matcher, matcherIndex) => ({
+                matcher: matcher.matcher,
+                hookCallbackIds: matcher.hooks.map((_, hookIndex) => `hook_${event}_${matcherIndex}_${hookIndex}`),
+                timeout: matcher.timeout,
+            }));
+        }
+        return Object.keys(config).length > 0 ? config : undefined;
+    }
+}
+exports.QueryController = QueryController;
+//# sourceMappingURL=query-controller.js.map

package/lib/_internal/query-controller.js.map

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

package/lib/query.d.ts

@@ -20,9 +20,9 @@ export declare class Query implements AsyncGenerator<Message, void> {
     private prompt;
     private options?;
     private transport;
+    private controller;
     private initialized;
     private abortController;
-    private hookCallbacks;
     private iterator;
     private connectPromise;
     private lockedSessionId;
@@ -89,12 +89,6 @@ export declare class Query implements AsyncGenerator<Message, void> {
     private createIterator;
     private initialize;
     private sendPrompt;
-    private handleControlRequest;
-    private handlePermissionRequest;
-    private handleHookCallback;
-    private registeredHooks?;
-    private registerHooks;
-    private buildHooksConfig;
     /**
      * Cleanup all resources.
      */

package/lib/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EACR,WAAW,EAUX,eAAe,EACf,OAAO,EACP,SAAS,EACT,OAAO,EACP,cAAc,EAGd,YAAY,EACZ,WAAW,EACd,MAAM,SAAS,CAAC;AAGjB;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,MAAM,EAAE;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,GAAG,KAAK,CAER;AAED;;GAEG;AACH,qBAAa,KAAM,YAAW,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC;IAqBnD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO,CAAC;IArBpB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,aAAa,CAA0I;IAC/J,OAAO,CAAC,QAAQ,CAA8C;IAC9D,OAAO,CAAC,cAAc,CAA8B;IAGpD,OAAO,CAAC,eAAe,CAAuB;IAG9C,OAAO,CAAC,UAAU,CAAuB;IAGzC,OAAO,CAAC,sBAAsB,CAAiB;IAC/C,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,sBAAsB,CAAiB;IAC/C,OAAO,CAAC,aAAa,CAAqB;gBAG9B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,GAAG,SAAS,EACvD,OAAO,CAAC,EAAE,OAAO,YAAA;IAkG7B,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC;IAOjD,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAI9C,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAKhD,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAO7D;;;;;;;;;;;;;;;;OAgBG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B;;;OAGG;IACH,OAAO,CAAC,YAAY;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAchC;;;;OAIG;IACG,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5D;;OAEG;IACH,iBAAiB,IAAI,cAAc;IAInC;;;;OAIG;IACG,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7C;;OAEG;IACH,QAAQ,IAAI,MAAM,GAAG,SAAS;IAIxB,oBAAoB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,iBAAiB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAO5C,eAAe,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAOvC,eAAe,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAO7C,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAOnC,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAQrD,cAAc;YAmEf,UAAU;YA0DV,UAAU;YA0BV,oBAAoB;YAWpB,uBAAuB;YA6DvB,kBAAkB;IAoBhC,OAAO,CAAC,eAAe,CAAC,CAAoD;IAE5E,OAAO,CAAC,aAAa;IAwBrB,OAAO,CAAC,gBAAgB;IAyBxB;;OAEG;IACH,OAAO,CAAC,OAAO;CAUlB"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,OAAO,EACP,SAAS,EACT,OAAO,EACP,cAAc,EACd,YAAY,EACZ,WAAW,EACd,MAAM,SAAS,CAAC;AAGjB;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,MAAM,EAAE;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,GAAG,KAAK,CAER;AAED;;GAEG;AACH,qBAAa,KAAM,YAAW,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC;IAqBnD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO,CAAC;IArBpB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAA8C;IAC9D,OAAO,CAAC,cAAc,CAA8B;IAGpD,OAAO,CAAC,eAAe,CAAuB;IAG9C,OAAO,CAAC,UAAU,CAAuB;IAGzC,OAAO,CAAC,sBAAsB,CAAiB;IAC/C,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,sBAAsB,CAAiB;IAC/C,OAAO,CAAC,aAAa,CAAqB;gBAG9B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,GAAG,SAAS,EACvD,OAAO,CAAC,EAAE,OAAO,YAAA;IA2G7B,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC;IAOjD,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAI9C,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAKhD,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAO7D;;;;;;;;;;;;;;;;OAgBG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B;;;OAGG;IACH,OAAO,CAAC,YAAY;IAId,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAchC;;;;OAIG;IACG,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5D;;OAEG;IACH,iBAAiB,IAAI,cAAc;IAInC;;;;OAIG;IACG,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7C;;OAEG;IACH,QAAQ,IAAI,MAAM,GAAG,SAAS;IAIxB,oBAAoB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,iBAAiB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAO5C,eAAe,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAOvC,eAAe,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAO7C,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAOnC,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAQrD,cAAc;YAmEf,UAAU;YAkCV,UAAU;IA0BxB;;OAEG;IACH,OAAO,CAAC,OAAO;CAUlB"}

package/lib/query.js

@@ -5,6 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Query = void 0;
 exports.query = query;
+const query_controller_1 = require("./_internal/query-controller");
 const connect_1 = require("./connect");
 const errors_1 = require("./errors");
 const transport_1 = require("./transport");
@@ -31,7 +32,6 @@ class Query {
         this.prompt = prompt;
         this.options = options;
         this.initialized = false;
-        this.hookCallbacks = new Map();
         this.iterator = null;
         this.connectPromise = null;
         // Session lock tracking
@@ -97,11 +97,16 @@ class Query {
             requestTimeoutMs: options === null || options === void 0 ? void 0 : options.requestTimeoutMs,
         };
         this.transport = (0, transport_1.createTransport)(transportOptions);
+        this.abortController = (_a = options === null || options === void 0 ? void 0 : options.abortController) !== null && _a !== void 0 ? _a : new AbortController();
+        // QueryController owns initialize + hook registry + control-request routing.
+        // The canUseTool getter is lazy because options shouldn't be re-read on every
+        // call (they don't change for query()), but it matches Session's pattern.
+        this.controller = new query_controller_1.QueryController(this.transport, options === null || options === void 0 ? void 0 : options.hooks, () => options === null || options === void 0 ? void 0 : options.canUseTool, () => this.abortController.signal);
         // Register control request handler on transport so control requests
         // are dispatched directly in handleLine(), bypassing the message queue.
         this.transport.onControlRequest(request => {
             // eslint-disable-next-line no-void
-            void this.handleControlRequest(request).catch(() => {
+            void this.controller.handleControlRequest(request).catch(() => {
                 // Individual control request errors shouldn't affect the query
             });
         });
@@ -110,8 +115,6 @@ class Query {
         this.connectPromise = this.transport.connect().catch(() => {
             // Ignore connection errors - they'll be reported when iteration starts
         });
-        this.abortController = (_a = options === null || options === void 0 ? void 0 : options.abortController) !== null && _a !== void 0 ? _a : new AbortController();
-        this.registerHooks(options === null || options === void 0 ? void 0 : options.hooks);
         // Track initial values (passed to CLI via command line args)
         this._initialPermissionMode = (_b = options === null || options === void 0 ? void 0 : options.permissionMode) !== null && _b !== void 0 ? _b : 'default';
         this._initialModel = options === null || options === void 0 ? void 0 : options.model;
@@ -327,7 +330,7 @@ class Query {
         }
     }
     async initialize() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         if (this.initialized) {
             return;
         }
@@ -339,39 +342,19 @@ class Query {
             }
             this.lockedSessionId = this.options.resume;
         }
-        const systemPrompt = typeof ((_c = this.options) === null || _c === void 0 ? void 0 : _c.systemPrompt) === 'string'
-            ? this.options.systemPrompt
-            : undefined;
-        const appendSystemPrompt = typeof ((_d = this.options) === null || _d === void 0 ? void 0 : _d.systemPrompt) === 'object'
-            ? this.options.systemPrompt.append
-            : undefined;
-        // Get SDK MCP server names from transport
-        const sdkMcpServerNames = this.transport.sdkMcpServerNames;
-        const initRequest = {
-            subtype: 'initialize',
-            hooks: this.buildHooksConfig(),
-            systemPrompt,
-            appendSystemPrompt,
-            agents: (_e = this.options) === null || _e === void 0 ? void 0 : _e.agents,
-            // Include SDK MCP server names from transport
-            sdkMcpServers: sdkMcpServerNames.length > 0 ? sdkMcpServerNames : undefined,
-            // Pass environment/endpoint for selfhosted environment resolution
-            environment: (_f = this.options) === null || _f === void 0 ? void 0 : _f.environment,
-            endpoint: (_g = this.options) === null || _g === void 0 ? void 0 : _g.endpoint,
-            // Declare SDK capabilities for tool enablement
-            capabilities: {
-                // SDK supports handling AskUserQuestion via canUseTool callback
-                askUserQuestion: true,
-            },
-            // Tell CLI whether prompt will follow (for resume history decision)
-            // hasPrompt=true means CLI should NOT replay history
+        const response = await this.controller.initialize({
+            agents: (_c = this.options) === null || _c === void 0 ? void 0 : _c.agents,
+            systemPrompt: (_d = this.options) === null || _d === void 0 ? void 0 : _d.systemPrompt,
+            environment: (_e = this.options) === null || _e === void 0 ? void 0 : _e.environment,
+            endpoint: (_f = this.options) === null || _f === void 0 ? void 0 : _f.endpoint,
+            // Tell CLI whether prompt will follow (controls resume history replay).
+            // hasPrompt=true means CLI should NOT replay history.
             hasPrompt: this.prompt !== undefined && this.prompt !== '',
-        };
-        const response = await this.transport.sendControlRequest(initRequest);
+        });
         this.initialized = true;
-        // Update model from CLI response if not set locally.
-        // Also update _initialModel so the "pending change" detection at iteration
-        // start doesn't treat the CLI-reported model as a user-initiated change.
+        // When ``options.model`` was unset, sync the CLI-reported model into both
+        // current *and* initial — otherwise the pending-change check at iteration
+        // start would treat the CLI's reported value as a user-initiated change.
         if (!this._currentModel && response.currentModelId) {
             this._currentModel = response.currentModelId;
             this._initialModel = response.currentModelId;
@@ -403,116 +386,6 @@ class Query {
             }
         }
     }
-    async handleControlRequest(request) {
-        const { subtype } = request.request;
-        if (subtype === 'hook_callback') {
-            await this.handleHookCallback(request);
-        }
-        else if (subtype === 'can_use_tool') {
-            await this.handlePermissionRequest(request);
-        }
-        // Note: mcp_message is handled at the transport level
-    }
-    async handlePermissionRequest(request) {
-        var _a;
-        const permRequest = request.request;
-        const { tool_name, input, tool_use_id, agent_id, permission_suggestions, blocked_path, decision_reason, } = permRequest;
-        const canUseTool = (_a = this.options) === null || _a === void 0 ? void 0 : _a.canUseTool;
-        // If no canUseTool callback provided, deny by default
-        if (!canUseTool) {
-            this.transport.sendControlResponse(request.request_id, {
-                allowed: false,
-                reason: 'No permission handler provided',
-                tool_use_id,
-            });
-            return;
-        }
-        try {
-            const result = await canUseTool(tool_name, input, {
-                signal: this.abortController.signal,
-                suggestions: permission_suggestions,
-                blockedPath: blocked_path,
-                decisionReason: decision_reason,
-                toolUseID: tool_use_id,
-                agentID: agent_id,
-            });
-            if (result.behavior === 'allow') {
-                this.transport.sendControlResponse(request.request_id, {
-                    allowed: true,
-                    updatedInput: result.updatedInput,
-                    tool_use_id,
-                });
-            }
-            else {
-                this.transport.sendControlResponse(request.request_id, {
-                    allowed: false,
-                    reason: result.message,
-                    interrupt: result.interrupt,
-                    tool_use_id,
-                });
-            }
-        }
-        catch (error) {
-            this.transport.sendControlResponse(request.request_id, {
-                allowed: false,
-                reason: error instanceof Error ? error.message : String(error),
-                tool_use_id,
-            });
-        }
-    }
-    async handleHookCallback(request) {
-        const { callback_id, input, tool_use_id } = request.request;
-        const callback = this.hookCallbacks.get(callback_id);
-        let response = { continue: true };
-        if (callback) {
-            try {
-                response = await callback(input, tool_use_id, { signal: this.abortController.signal });
-            }
-            catch (error) {
-                response = {
-                    continue: false,
-                    stopReason: error instanceof Error ? error.message : String(error),
-                };
-            }
-        }
-        this.transport.sendControlResponse(request.request_id, response);
-    }
-    registerHooks(hooks) {
-        if (!hooks) {
-            return;
-        }
-        this.registeredHooks = hooks;
-        // Build callback ID mapping for each hook - must match buildHooksConfig
-        for (const [event, matchers] of Object.entries(hooks)) {
-            if (!matchers) {
-                continue;
-            }
-            matchers.forEach((matcher, matcherIndex) => {
-                matcher.hooks.forEach((hook, hookIndex) => {
-                    const callbackId = `hook_${event}_${matcherIndex}_${hookIndex}`;
-                    this.hookCallbacks.set(callbackId, hook);
-                });
-            });
-        }
-    }
-    buildHooksConfig() {
-        if (!this.registeredHooks) {
-            return undefined;
-        }
-        const config = {};
-        for (const [event, matchers] of Object.entries(this.registeredHooks)) {
-            if (!matchers) {
-                continue;
-            }
-            const hookEvent = event;
-            config[hookEvent] = matchers.map((matcher, matcherIndex) => ({
-                matcher: matcher.matcher,
-                hookCallbackIds: matcher.hooks.map((_, hookIndex) => `hook_${event}_${matcherIndex}_${hookIndex}`),
-                timeout: matcher.timeout,
-            }));
-        }
-        return Object.keys(config).length > 0 ? config : undefined;
-    }
     /**
      * Cleanup all resources.
      */