ycodium-acp-executor 0.2.3598 → 0.2.3614

package/README.md

@@ -96,11 +96,29 @@ What the executor handles for you:
 Do not fork the state machine for one CLI's quirks. Pass `hooks` (`AcpVendorHooks`) instead:
 
 - `permissionUserInput` turns a permission request into a structured question.
-- `onExtensionRequest` and `onExtensionNotification` handle vendor-private methods.
+- `onExtensionRequest` and `onExtensionNotification` handle vendor-private methods. A notification
+  hook can return `task.*` events, for example to report a vendor's subagent lifecycle.
+- `onSessionUpdate` sees every `session/update` first and can return `task.*` events. Updates
+  from another session on the same connection, such as a subagent's own session, reach only this
+  hook and never the session's timeline. A hook that recognizes a subagent's session calls
+  `ctx.markChildSession(id)` so its updates stay out of the timeline even while a session
+  open is in flight.
+- `onToolCallUpdated` sees every tool call update and can report tasks found in tool results, or
+  mark a call as handled so it is not shown as an ordinary tool.
+- `onSessionEnded` runs when the session ends (process exit, closed connection, dispose), before
+  `session.exited`, and returns a conclusion for every subagent still open: `cancelled` when it
+  lived in the same process, `idle` with `outcomeUnknown: true` when it may still run elsewhere.
+  Without one, the client folds the old start back to running once the parent resumes.
 - `readContextWindow` reads context usage that the CLI records somewhere other than ACP.
 - `promptSettlement` lets a turn end on a signal other than the prompt response.
 - `resolveRequestedModelId` and `resolveDisplayModelId` map model names.
 
+Subagent sessions (the ACP draft of the same name) are an option, off by default: set
+`subagentSessions: true` and `initialize` declares `subagents: {}`, then `subagent_update` on the
+parent session becomes `task.*` events; when the session ends, a child last seen running or
+waiting is reported idle with `outcomeUnknown: true`. Pass the same value to `openAcpProbeHandshake`
+so the probe asks the agent the same question.
+
 ## Probing a CLI
 
 Before a session exists, an instance usually has to report whether the CLI is installed, its

package/dist/executor/child-sessions.d.ts

@@ -0,0 +1,32 @@
+/**
+ * 子会话身份登记：追踪器（`subagent_update`）与厂商钩子（`markChildSession`）共用这一份，
+ * 路由「这条更新是不是子会话发的」也问它，不另存一份会各自淘汰到分歧的集合。
+ */
+export type ChildStatus = "running" | "waiting" | "idle" | "cancelled" | "failed";
+export type ChildRecord = {
+    /** 首见时的轮次；首见时没有轮次就取之后第一个有的，之后固定。 */
+    turnId: string | undefined;
+    title: string | undefined;
+    description: string | undefined;
+    readonly parentAgentId: string | undefined;
+    /** 最近一次观察到的状态（含 `session/load` 重放里的）；没见过明确状态为 undefined。 */
+    observed: ChildStatus | undefined;
+    /** 已向宿主报告过的状态与错误详情；重放观察到的不算。 */
+    reported: ChildStatus | undefined;
+    reportedError: string | undefined;
+    /** 宿主已经有这一行（发过 `task.started`，或重放里恢复的）：之后不再发 started。 */
+    announced: boolean;
+    /** 标题、描述变了但还没随带状态的事件发出去。 */
+    pendingMetadata: boolean;
+};
+export type ChildSessionRegistry = {
+    readonly has: (sessionId: string) => boolean;
+    readonly get: (sessionId: string) => ChildRecord | undefined;
+    /** 只登记身份（厂商钩子用）；已有记录不动。 */
+    readonly mark: (sessionId: string) => void;
+    /** 只接收状态已初始化的完整记录；淘汰在登记之后做，且新登记的这条本次不淘汰。 */
+    readonly add: (sessionId: string, record: ChildRecord) => void;
+    readonly entries: () => IterableIterator<[string, ChildRecord]>;
+};
+export declare function createChildSessionRegistry(limit?: number): ChildSessionRegistry;
+//# sourceMappingURL=child-sessions.d.ts.map

package/dist/executor/child-sessions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"child-sessions.d.ts","sourceRoot":"","sources":["../../src/executor/child-sessions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAC;AAElF,MAAM,MAAM,WAAW,GAAG;IACxB,oCAAoC;IACpC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,4DAA4D;IAC5D,QAAQ,EAAE,WAAW,GAAG,SAAS,CAAC;IAClC,gCAAgC;IAChC,QAAQ,EAAE,WAAW,GAAG,SAAS,CAAC;IAClC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,yDAAyD;IACzD,SAAS,EAAE,OAAO,CAAC;IACnB,4BAA4B;IAC5B,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;IAC7C,QAAQ,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAC;IAC7D,2BAA2B;IAC3B,QAAQ,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,4CAA4C;IAC5C,QAAQ,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;IAC/D,QAAQ,CAAC,OAAO,EAAE,MAAM,gBAAgB,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;CACjE,CAAC;AAOF,wBAAgB,0BAA0B,CAAC,KAAK,SAAc,GAAG,oBAAoB,CA+CpF"}

package/dist/executor/child-sessions.js

@@ -0,0 +1,56 @@
+/**
+ * 子会话身份登记：追踪器（`subagent_update`）与厂商钩子（`markChildSession`）共用这一份，
+ * 路由「这条更新是不是子会话发的」也问它，不另存一份会各自淘汰到分歧的集合。
+ */
+const CHILD_LIMIT = 256;
+const active = (status) => status === "running" || status === "waiting";
+export function createChildSessionRegistry(limit = CHILD_LIMIT) {
+    const records = new Map();
+    /** 还在跑、等待中、或有活后代的不淘汰；其余取最老的。全在用就让它超出上限，不丢活的。 */
+    const evictOne = (keep) => {
+        const protectedIds = new Set();
+        for (const [id, record] of records) {
+            if (!active(record.observed))
+                continue;
+            protectedIds.add(id);
+            let parent = record.parentAgentId;
+            while (parent !== undefined && !protectedIds.has(parent)) {
+                protectedIds.add(parent);
+                parent = records.get(parent)?.parentAgentId;
+            }
+        }
+        for (const id of records.keys()) {
+            if (id === keep || protectedIds.has(id))
+                continue;
+            records.delete(id);
+            return;
+        }
+    };
+    const add = (sessionId, record) => {
+        records.set(sessionId, record);
+        if (records.size > limit)
+            evictOne(sessionId);
+    };
+    return {
+        has: (sessionId) => records.has(sessionId),
+        get: (sessionId) => records.get(sessionId),
+        mark: (sessionId) => {
+            if (records.has(sessionId))
+                return;
+            add(sessionId, {
+                turnId: undefined,
+                title: undefined,
+                description: undefined,
+                parentAgentId: undefined,
+                observed: undefined,
+                reported: undefined,
+                reportedError: undefined,
+                announced: false,
+                pendingMetadata: false,
+            });
+        },
+        add,
+        entries: () => records.entries(),
+    };
+}
+//# sourceMappingURL=child-sessions.js.map

package/dist/executor/child-sessions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"child-sessions.js","sourceRoot":"","sources":["../../src/executor/child-sessions.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA+BH,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,MAAM,MAAM,GAAG,CAAC,MAA+B,EAAW,EAAE,CAC1D,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,CAAC;AAE/C,MAAM,UAAU,0BAA0B,CAAC,KAAK,GAAG,WAAW;IAC5D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE/C,gDAAgD;IAChD,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAQ,EAAE;QACtC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,KAAK,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACnC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAAE,SAAS;YACvC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACrB,IAAI,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC;YAClC,OAAO,MAAM,KAAK,SAAS,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzD,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACzB,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC;YAC9C,CAAC;QACH,CAAC;QACD,KAAK,MAAM,EAAE,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YAChC,IAAI,EAAE,KAAK,IAAI,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;gBAAE,SAAS;YAClD,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACnB,OAAO;QACT,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,GAAG,GAAgC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE;QAC7D,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC/B,IAAI,OAAO,CAAC,IAAI,GAAG,KAAK;YAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC,CAAC;IAEF,OAAO;QACL,GAAG,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;QAC1C,GAAG,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;QAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,EAAE;YAClB,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;gBAAE,OAAO;YACnC,GAAG,CAAC,SAAS,EAAE;gBACb,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,SAAS;gBAChB,WAAW,EAAE,SAAS;gBACtB,aAAa,EAAE,SAAS;gBACxB,QAAQ,EAAE,SAAS;gBACnB,QAAQ,EAAE,SAAS;gBACnB,aAAa,EAAE,SAAS;gBACxB,SAAS,EAAE,KAAK;gBAChB,eAAe,EAAE,KAAK;aACvB,CAAC,CAAC;QACL,CAAC;QACD,GAAG;QACH,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;KACjC,CAAC;AACJ,CAAC"}

package/dist/executor/lifecycle.d.ts

@@ -6,7 +6,7 @@ import type { createExecutorSession } from "./session.ts";
 import type { createExecutorSettlement } from "./settlement.ts";
 import { type AcpExecutorSupport } from "./support.ts";
 import type { createExecutorUpdates } from "./updates.ts";
-export declare function createExecutorLifecycle({ failIfDisposed, requireStarted, interruptedTurnIds, settleAllApprovals, settleAllUserInputs, abortPendingSettlement, connection, waitForPromptIdle, cancelGraceMs, isLive, closeActiveAssistantSegment, emit, stamp, options, promptMutex, randomId, nowMs, emitCompactionState, sendPromptRpc, compactions, notifyPromptSettled, eventStream, onInputDead, shared, promptResults, }: Pick<AcpExecutorSupport, "interruptedTurnIds" | "connection" | "cancelGraceMs" | "options" | "promptMutex" | "randomId" | "nowMs" | "compactions" | "eventStream" | "onInputDead" | "shared"> & Pick<ReturnType<typeof createExecutorRuntime>, "failIfDisposed" | "waitForPromptIdle" | "isLive" | "closeActiveAssistantSegment" | "emit" | "stamp" | "notifyPromptSettled"> & Pick<ReturnType<typeof createExecutorUpdates>, "emitCompactionState"> & Pick<ReturnType<typeof createExecutorRequests>, "settleAllApprovals" | "settleAllUserInputs"> & Pick<ReturnType<typeof createExecutorSettlement>, "abortPendingSettlement"> & Pick<ReturnType<typeof createExecutorSession>, "requireStarted"> & Pick<ReturnType<typeof createExecutorPrompt>, "sendPromptRpc"> & {
+export declare function createExecutorLifecycle({ failIfDisposed, requireStarted, interruptedTurnIds, settleAllApprovals, settleAllUserInputs, abortPendingSettlement, connection, waitForPromptIdle, cancelGraceMs, isLive, closeActiveAssistantSegment, emit, stamp, options, promptMutex, randomId, nowMs, emitCompactionState, sendPromptRpc, compactions, notifyPromptSettled, eventStream, onInputDead, shared, promptResults, settleToolSubagents, settleSessionEnded, }: Pick<AcpExecutorSupport, "interruptedTurnIds" | "connection" | "cancelGraceMs" | "options" | "promptMutex" | "randomId" | "nowMs" | "compactions" | "eventStream" | "onInputDead" | "shared"> & Pick<ReturnType<typeof createExecutorRuntime>, "failIfDisposed" | "waitForPromptIdle" | "isLive" | "closeActiveAssistantSegment" | "emit" | "stamp" | "notifyPromptSettled"> & Pick<ReturnType<typeof createExecutorUpdates>, "emitCompactionState" | "settleToolSubagents" | "settleSessionEnded"> & Pick<ReturnType<typeof createExecutorRequests>, "settleAllApprovals" | "settleAllUserInputs"> & Pick<ReturnType<typeof createExecutorSettlement>, "abortPendingSettlement"> & Pick<ReturnType<typeof createExecutorSession>, "requireStarted"> & Pick<ReturnType<typeof createExecutorPrompt>, "sendPromptRpc"> & {
     promptResults: ReturnType<typeof createPromptResults>;
 }): {
     cancel: (turnId?: string) => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/executor/lifecycle.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,wBAAgB,uBAAuB,CAAC,EACtC,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,KAAK,EACL,mBAAmB,EACnB,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,WAAW,EACX,MAAM,EACN,aAAa,GACd,EAAE,IAAI,CACL,kBAAkB,EAChB,oBAAoB,GACpB,YAAY,GACZ,eAAe,GACf,SAAS,GACT,aAAa,GACb,UAAU,GACV,OAAO,GACP,aAAa,GACb,aAAa,GACb,aAAa,GACb,QAAQ,CACX,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,GACR,6BAA6B,GAC7B,MAAM,GACN,OAAO,GACP,qBAAqB,CACxB,GACD,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,qBAAqB,CAAC,GACrE,IAAI,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,EAAE,oBAAoB,GAAG,qBAAqB,CAAC,GAC7F,IAAI,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,EAAE,wBAAwB,CAAC,GAC3E,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,gBAAgB,CAAC,GAChE,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,eAAe,CAAC,GAAG;IAC/D,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CACvD;sBAC8B,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;qBAuDvB;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,IAAI,CAAC;yBA2ElD,MAAM,GAAG,IAAI,KAAG,OAAO,CAAC,IAAI,CAAC;EA4D1D"}
+{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/executor/lifecycle.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,wBAAgB,uBAAuB,CAAC,EACtC,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,KAAK,EACL,mBAAmB,EACnB,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,WAAW,EACX,MAAM,EACN,aAAa,EACb,mBAAmB,EACnB,kBAAkB,GACnB,EAAE,IAAI,CACL,kBAAkB,EAChB,oBAAoB,GACpB,YAAY,GACZ,eAAe,GACf,SAAS,GACT,aAAa,GACb,UAAU,GACV,OAAO,GACP,aAAa,GACb,aAAa,GACb,aAAa,GACb,QAAQ,CACX,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,GACR,6BAA6B,GAC7B,MAAM,GACN,OAAO,GACP,qBAAqB,CACxB,GACD,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACxC,qBAAqB,GAAG,qBAAqB,GAAG,oBAAoB,CACrE,GACD,IAAI,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,EAAE,oBAAoB,GAAG,qBAAqB,CAAC,GAC7F,IAAI,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,EAAE,wBAAwB,CAAC,GAC3E,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,gBAAgB,CAAC,GAChE,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,eAAe,CAAC,GAAG;IAC/D,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CACvD;sBAC8B,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;qBAwDvB;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,IAAI,CAAC;yBA2ElD,MAAM,GAAG,IAAI,KAAG,OAAO,CAAC,IAAI,CAAC;EA6D1D"}

package/dist/executor/lifecycle.js

@@ -4,7 +4,7 @@
 import { AcpExecutorCancelTimeoutError, AcpExecutorDisposedError, AcpExecutorError, } from "../errors.js";
 import {} from "../protocol.js";
 import { DEFAULT_RESULT_DRAIN_TIMEOUT_MS, } from "./support.js";
-export function createExecutorLifecycle({ failIfDisposed, requireStarted, interruptedTurnIds, settleAllApprovals, settleAllUserInputs, abortPendingSettlement, connection, waitForPromptIdle, cancelGraceMs, isLive, closeActiveAssistantSegment, emit, stamp, options, promptMutex, randomId, nowMs, emitCompactionState, sendPromptRpc, compactions, notifyPromptSettled, eventStream, onInputDead, shared, promptResults, }) {
+export function createExecutorLifecycle({ failIfDisposed, requireStarted, interruptedTurnIds, settleAllApprovals, settleAllUserInputs, abortPendingSettlement, connection, waitForPromptIdle, cancelGraceMs, isLive, closeActiveAssistantSegment, emit, stamp, options, promptMutex, randomId, nowMs, emitCompactionState, sendPromptRpc, compactions, notifyPromptSettled, eventStream, onInputDead, shared, promptResults, settleToolSubagents, settleSessionEnded, }) {
     const cancel = async (turnId) => {
         failIfDisposed();
         const started = requireStarted();
@@ -36,6 +36,7 @@ export function createExecutorLifecycle({ failIfDisposed, requireStarted, interr
                         shared.promptsInFlight = 0;
                         shared.activeTurnId = undefined;
                         shared.status = "ready";
+                        settleToolSubagents("turn-interrupted", targetTurnId);
                         emit({
                             type: "turn.completed",
                             ...stamp(),
@@ -152,6 +153,7 @@ export function createExecutorLifecycle({ failIfDisposed, requireStarted, interr
             shared.abortLocalPrompt?.();
             promptResults.finishUnreceived();
             await promptResults.wait();
+            settleSessionEnded();
             emit({
                 type: "session.exited",
                 ...stamp(),

package/dist/executor/lifecycle.js.map

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

package/dist/executor/prompt.d.ts

@@ -2,11 +2,13 @@ import { type PromptResponse } from "../protocol.ts";
 import type { AcpContentBlock, AcpPromptInput, AcpTurnResult } from "../types.ts";
 import type { createExecutorRuntime } from "./runtime.ts";
 import type { createExecutorSession } from "./session.ts";
+import type { createExecutorUpdates } from "./updates.ts";
 import type { createExecutorSettlement } from "./settlement.ts";
 import type { AcpExecutorSupport } from "./support.ts";
 import type { createPromptResults, PromptResult } from "./prompt-results.ts";
-export declare function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit, stamp, options, interruptedTurnIds, hooks, randomId, connection, rememberSettledPromptKey, failIfDisposed, requireStarted, threadMutex, promptMutex, applyRequestedModel, notifyPromptSettled, shared, promptResults, }: Pick<AcpExecutorSupport, "options" | "interruptedTurnIds" | "hooks" | "randomId" | "connection" | "threadMutex" | "promptMutex" | "shared"> & Pick<ReturnType<typeof createExecutorRuntime>, "isLive" | "closeActiveAssistantSegment" | "emit" | "stamp" | "failIfDisposed" | "notifyPromptSettled"> & Pick<ReturnType<typeof createExecutorSettlement>, "rememberSettledPromptKey"> & Pick<ReturnType<typeof createExecutorSession>, "requireStarted" | "applyRequestedModel"> & {
+export declare function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit, stamp, options, interruptedTurnIds, hooks, randomId, connection, rememberSettledPromptKey, failIfDisposed, requireStarted, threadMutex, promptMutex, applyRequestedModel, notifyPromptSettled, shared, promptResults, settleToolSubagents, }: Pick<AcpExecutorSupport, "options" | "interruptedTurnIds" | "hooks" | "randomId" | "connection" | "threadMutex" | "promptMutex" | "shared"> & Pick<ReturnType<typeof createExecutorRuntime>, "isLive" | "closeActiveAssistantSegment" | "emit" | "stamp" | "failIfDisposed" | "notifyPromptSettled"> & Pick<ReturnType<typeof createExecutorSettlement>, "rememberSettledPromptKey"> & Pick<ReturnType<typeof createExecutorSession>, "requireStarted" | "applyRequestedModel"> & {
     promptResults: ReturnType<typeof createPromptResults>;
+    settleToolSubagents: ReturnType<typeof createExecutorUpdates>["settleToolSubagents"];
 }): {
     sendPromptRpc: (sessionId: string, promptParts: ReadonlyArray<AcpContentBlock>, onWritten?: () => void, record?: PromptResult) => Promise<PromptResponse>;
     prompt: (input: AcpPromptInput) => Promise<AcpTurnResult>;

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

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/executor/prompt.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAE7E,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,kBAAkB,EAClB,KAAK,EACL,QAAQ,EACR,UAAU,EACV,wBAAwB,EACxB,cAAc,EACd,cAAc,EACd,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,MAAM,EACN,aAAa,GACd,EAAE,IAAI,CACL,kBAAkB,EAChB,SAAS,GACT,oBAAoB,GACpB,OAAO,GACP,UAAU,GACV,YAAY,GACZ,aAAa,GACb,aAAa,GACb,QAAQ,CACX,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,QAAQ,GACR,6BAA6B,GAC7B,MAAM,GACN,OAAO,GACP,gBAAgB,GAChB,qBAAqB,CACxB,GACD,IAAI,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,EAAE,0BAA0B,CAAC,GAC7E,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAAC,GAAG;IACzF,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CACvD;+BA2DY,MAAM,eACJ,aAAa,CAAC,eAAe,CAAC,cAC/B,MAAM,IAAI,WACb,YAAY,KACpB,OAAO,CAAC,cAAc,CAAC;oBAuEG,cAAc,KAAG,OAAO,CAAC,aAAa,CAAC;EAiPrE"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/executor/prompt.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAIlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAE7E,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,kBAAkB,EAClB,KAAK,EACL,QAAQ,EACR,UAAU,EACV,wBAAwB,EACxB,cAAc,EACd,cAAc,EACd,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,MAAM,EACN,aAAa,EACb,mBAAmB,GACpB,EAAE,IAAI,CACL,kBAAkB,EAChB,SAAS,GACT,oBAAoB,GACpB,OAAO,GACP,UAAU,GACV,YAAY,GACZ,aAAa,GACb,aAAa,GACb,QAAQ,CACX,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,QAAQ,GACR,6BAA6B,GAC7B,MAAM,GACN,OAAO,GACP,gBAAgB,GAChB,qBAAqB,CACxB,GACD,IAAI,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,EAAE,0BAA0B,CAAC,GAC7E,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAAC,GAAG;IACzF,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;IACtD,mBAAmB,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,qBAAqB,CAAC,CAAC;CACtF;+BA+DY,MAAM,eACJ,aAAa,CAAC,eAAe,CAAC,cAC/B,MAAM,IAAI,WACb,YAAY,KACpB,OAAO,CAAC,cAAc,CAAC;oBAuEG,cAAc,KAAG,OAAO,CAAC,aAAa,CAAC;EAiPrE"}

package/dist/executor/prompt.js

@@ -5,9 +5,10 @@ import { acpPromptSettlementBelongsToContext } from "../adapter-support.js";
 import { AcpExecutorDisposedError, AcpExecutorError } from "../errors.js";
 import { acpPromptFailureCategory, failureCategoryField, readAcpFailureCategory, withFailureCategory, } from "../failureCategory.js";
 import {} from "../protocol.js";
+import { toolSubagentSettlementOfTurn } from "../tool-subagents.js";
 import { selectPromptTurnId } from "../util.js";
 import {} from "../vendor-hooks.js";
-export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit, stamp, options, interruptedTurnIds, hooks, randomId, connection, rememberSettledPromptKey, failIfDisposed, requireStarted, threadMutex, promptMutex, applyRequestedModel, notifyPromptSettled, shared, promptResults, }) {
+export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit, stamp, options, interruptedTurnIds, hooks, randomId, connection, rememberSettledPromptKey, failIfDisposed, requireStarted, threadMutex, promptMutex, applyRequestedModel, notifyPromptSettled, shared, promptResults, settleToolSubagents, }) {
     /** 这一条 prompt 落定；返回整轮是否就此收口（发了 `turn.completed`）。 */
     const settleTurn = (input) => {
         if (!isLive(input.expectedGeneration) || input.record.finished) {
@@ -32,6 +33,7 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
             shared.status = "ready";
         }
         const interrupted = promptResults.hasInterrupted(input.turnId);
+        settleToolSubagents(toolSubagentSettlementOfTurn(interrupted ? "cancelled" : input.state, input.failureCategory), input.turnId);
         emit({
             type: "turn.completed",
             ...stamp(),

package/dist/executor/prompt.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/executor/session.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAY/B,OAAO,EAIL,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,qBAAqB,CAAC,EACpC,OAAO,EACP,UAAU,EACV,MAAM,EACN,IAAI,EACJ,KAAK,EACL,cAAc,EACd,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,YAAY,GAAG,QAAQ,CAAC,GAC9D,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,gBAAgB,CAAC;iCAiFpD;QACxC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;QACvC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC;QACxC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;KACrC,KAAG,OAAO;wBArFO,sBAAsB;4BAClB,MAAM;wBACV,uBAAuB;MAmFP;iBAoNV,OAAO,CAAC,qBAAqB,CAAC;0BA4B3B;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE;4BAQjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;EAwB5D"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/executor/session.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAY/B,OAAO,EAIL,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,qBAAqB,CAAC,EACpC,OAAO,EACP,UAAU,EACV,MAAM,EACN,IAAI,EACJ,KAAK,EACL,cAAc,EACd,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,YAAY,GAAG,QAAQ,CAAC,GAC9D,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,gBAAgB,CAAC;iCAuGpD;QACxC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;QACvC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC;QACxC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;KACrC,KAAG,OAAO;wBA3GO,sBAAsB;4BAClB,MAAM;wBACV,uBAAuB;MAyGP;iBA0NV,OAAO,CAAC,qBAAqB,CAAC;0BA4B3B;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE;4BAQjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;EAwB5D"}

package/dist/executor/session.js

@@ -4,7 +4,7 @@
 import { applyRequestedEffort } from "../apply-effort.js";
 import { unhandledConfigCategories } from "../config-option-wiring.js";
 import { AcpExecutorDisposedError, AcpExecutorNotStartedError, AcpExecutorRequestError, withStartupStderr, } from "../errors.js";
-import { acpInitializePayload } from "../handshake.js";
+import { acpCapabilityOverrides, acpInitializePayload } from "../handshake.js";
 import { modelSelectionStateFromSetup, normalizeModelId, } from "../model-selection.js";
 import { readAcpFailureCategory } from "../failureCategory.js";
 import { judgeRequestedModel, MODEL_CATALOG_REFRESH_TIMEOUT_MS, ModelCatalogRefreshTimeoutError, modelRefreshFailedError, modelRefreshTimedOutError, modelUnavailableError, } from "../model-send.js";
@@ -12,6 +12,26 @@ import {} from "../protocol.js";
 import { acpModeConfigId } from "../runtime-mode.js";
 import { extractModelConfigId, filterMcpServersByAgentCapabilities, parseSessionModeState, } from "../runtime-model.js";
 export function createExecutorSession({ options, connection, isLive, emit, stamp, failIfDisposed, shared, }) {
+    /**
+     * 开会话的请求（新开、加载、续接）。在途期间新会话的 id 还不知道，通用机不判别的会话；
+     * 会话 id 一知道就记进本执行器开过的会话。
+     */
+    const requestSession = async (method, params) => {
+        const knownSessionId = params["sessionId"];
+        if (typeof knownSessionId === "string")
+            shared.ownSessionIds.add(knownSessionId);
+        shared.sessionOpensInFlight += 1;
+        try {
+            const result = await connection.request(method, params);
+            const sessionId = result?.sessionId;
+            if (typeof sessionId === "string" && sessionId.length > 0)
+                shared.ownSessionIds.add(sessionId);
+            return result;
+        }
+        finally {
+            shared.sessionOpensInFlight -= 1;
+        }
+    };
     const openFreshSession = async (expectedGeneration) => {
         const initialized = shared.initializeResult;
         // 没有握手就开不出新会话。当成刷新失败，不沿用旧目录把这一轮发出去。
@@ -23,7 +43,7 @@ export function createExecutorSession({ options, connection, isLive, emit, stamp
             ? { additionalDirectories: options.additionalDirectories }
             : {};
         // 续开会话也走 session/new：load/resume 带回的是旧目录，重判要用一份新的。
-        const created = await connection.request("session/new", {
+        const created = await requestSession("session/new", {
             cwd: options.cwd,
             mcpServers,
             ...additionalDirectories,
@@ -148,7 +168,10 @@ export function createExecutorSession({ options, connection, isLive, emit, stamp
     };
     const startOnce = async (expectedGeneration) => {
         // 载荷与探测路径共用一份（`handshake.ts`）：agent 按客户端能力决定播报什么，两边各写一份就会问出两个不同的问题。
-        const initializePayload = acpInitializePayload(options.clientInfo, options.clientCapabilities);
+        const initializePayload = acpInitializePayload(options.clientInfo, acpCapabilityOverrides({
+            clientCapabilities: options.clientCapabilities,
+            subagentSessions: options.subagentSessions,
+        }));
         const initialized = await connection.request("initialize", initializePayload);
         if (!isLive(expectedGeneration)) {
             throw new AcpExecutorDisposedError();
@@ -170,7 +193,7 @@ export function createExecutorSession({ options, connection, isLive, emit, stamp
         let setup;
         let nextSessionId;
         if (options.resumeSessionId && options.resumeMethod === "session/resume") {
-            setup = await connection.request("session/resume", {
+            setup = await requestSession("session/resume", {
                 sessionId: options.resumeSessionId,
                 cwd: options.cwd,
                 mcpServers,
@@ -181,7 +204,7 @@ export function createExecutorSession({ options, connection, isLive, emit, stamp
         else if (options.resumeSessionId) {
             shared.sessionLoadInFlight = true;
             try {
-                setup = await connection.request("session/load", {
+                setup = await requestSession("session/load", {
                     sessionId: options.resumeSessionId,
                     cwd: options.cwd,
                     mcpServers,
@@ -198,7 +221,7 @@ export function createExecutorSession({ options, connection, isLive, emit, stamp
             nextSessionId = options.resumeSessionId;
         }
         else {
-            const created = await connection.request("session/new", {
+            const created = await requestSession("session/new", {
                 cwd: options.cwd,
                 mcpServers,
                 ...additionalDirectories,

package/dist/executor/session.js.map

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

package/dist/executor/subagent-sessions.d.ts

@@ -0,0 +1,33 @@
+/**
+ * ACP「子会话」草案（Subagent Sessions）：客户端在 `initialize` 声明 `subagents` 后，agent 才会在
+ * 父会话上发 `subagent_update`。这里把它翻成 `task.*`，只进 agent 面板（`timelineBypass`）。
+ *
+ * 草案尚未定稿，字段一律宽松解析：形状不符就忽略，不报错也不猜。
+ * - 关联不终止：idle、做完、取消都不是终态，所以从不发 `task.completed`。
+ * - `unknown` 表示失联，不改状态；没见过明确状态之前只记身份，不发 `task.started`。
+ * - 会话结束时还在跑、在等的子 agent 报 `idle` 并带 `outcomeUnknown`：它是 agent 的独立会话，
+ *   可能在别处还活着，不能写成取消；不报的话父会话恢复后会被折回运行中。
+ * - 标题、描述的变化只记在记录里（并标记未发布），随下一次带明确状态的通知一起发，状态没变也发：不带状态的 `task.updated` 在
+ *   截断窗口里会被客户端折成 pending。
+ * - 嵌套关系只用于路由（认出孙 agent 的更新），不写进载荷：孙 agent 作为平级子 agent 上报。
+ */
+import type { SessionNotification } from "../protocol.ts";
+import type { AcpTaskEvent } from "../vendor-hooks.ts";
+import type { ChildSessionRegistry } from "./child-sessions.ts";
+export type SubagentSessionTracker = {
+    /**
+     * 读一条 `session/update`。`foreign` = 它来自本执行器没开过的会话；那种只有外层是已知子会话时
+     * 才算嵌套（孙 agent），否则忽略。
+     */
+    readonly observe: (notification: SessionNotification, ctx: {
+        readonly turnId: string | undefined;
+        readonly foreign: boolean;
+        readonly ownSessionIds: ReadonlySet<string>;
+        /** `session/load` 重放窗口：只恢复身份、父子关系与观察到的状态，不发任何事件。 */
+        readonly silent: boolean;
+    }) => ReadonlyArray<AcpTaskEvent>;
+    /** 会话结束：给最后一次已知还在跑或在等的子 agent 各留一条「状态未知」的 idle。 */
+    readonly settleSessionEnded: () => ReadonlyArray<AcpTaskEvent>;
+};
+export declare function createSubagentSessionTracker(registry: ChildSessionRegistry): SubagentSessionTracker;
+//# sourceMappingURL=subagent-sessions.d.ts.map

package/dist/executor/subagent-sessions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subagent-sessions.d.ts","sourceRoot":"","sources":["../../src/executor/subagent-sessions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAe,oBAAoB,EAAe,MAAM,qBAAqB,CAAC;AAoB1F,MAAM,MAAM,sBAAsB,GAAG;IACnC;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,CAChB,YAAY,EAAE,mBAAmB,EACjC,GAAG,EAAE;QACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;QAC5C,oDAAoD;QACpD,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;KAC1B,KACE,aAAa,CAAC,YAAY,CAAC,CAAC;IACjC,mDAAmD;IACnD,QAAQ,CAAC,kBAAkB,EAAE,MAAM,aAAa,CAAC,YAAY,CAAC,CAAC;CAChE,CAAC;AAaF,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,oBAAoB,GAC7B,sBAAsB,CAkHxB"}