ycodium-acp-executor 0.2.3598 → 0.2.3608
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +19 -1
- package/dist/executor/child-sessions.d.ts +32 -0
- package/dist/executor/child-sessions.d.ts.map +1 -0
- package/dist/executor/child-sessions.js +56 -0
- package/dist/executor/child-sessions.js.map +1 -0
- package/dist/executor/lifecycle.d.ts +1 -1
- package/dist/executor/lifecycle.d.ts.map +1 -1
- package/dist/executor/lifecycle.js +3 -1
- package/dist/executor/lifecycle.js.map +1 -1
- package/dist/executor/prompt.d.ts +3 -1
- package/dist/executor/prompt.d.ts.map +1 -1
- package/dist/executor/prompt.js +3 -1
- package/dist/executor/prompt.js.map +1 -1
- package/dist/executor/session.d.ts.map +1 -1
- package/dist/executor/session.js +29 -6
- package/dist/executor/session.js.map +1 -1
- package/dist/executor/subagent-sessions.d.ts +33 -0
- package/dist/executor/subagent-sessions.d.ts.map +1 -0
- package/dist/executor/subagent-sessions.js +147 -0
- package/dist/executor/subagent-sessions.js.map +1 -0
- package/dist/executor/support.d.ts +13 -0
- package/dist/executor/support.d.ts.map +1 -1
- package/dist/executor/support.js.map +1 -1
- package/dist/executor/updates.d.ts +6 -1
- package/dist/executor/updates.d.ts.map +1 -1
- package/dist/executor/updates.js +99 -25
- package/dist/executor/updates.js.map +1 -1
- package/dist/executor.d.ts +10 -0
- package/dist/executor.d.ts.map +1 -1
- package/dist/executor.js +11 -3
- package/dist/executor.js.map +1 -1
- package/dist/handshake.d.ts +7 -0
- package/dist/handshake.d.ts.map +1 -1
- package/dist/handshake.js +12 -2
- package/dist/handshake.js.map +1 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/probe.d.ts +2 -0
- package/dist/probe.d.ts.map +1 -1
- package/dist/probe.js +2 -2
- package/dist/probe.js.map +1 -1
- package/dist/tool-call-state.d.ts +4 -0
- package/dist/tool-call-state.d.ts.map +1 -1
- package/dist/tool-call-state.js +9 -3
- package/dist/tool-call-state.js.map +1 -1
- package/dist/tool-subagents.d.ts +91 -0
- package/dist/tool-subagents.d.ts.map +1 -0
- package/dist/tool-subagents.js +347 -0
- package/dist/tool-subagents.js.map +1 -0
- package/dist/vendor-hooks.d.ts +126 -16
- package/dist/vendor-hooks.d.ts.map +1 -1
- package/dist/vendor-hooks.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
import { asTrimmedString, isRecord } from "../util.js";
|
|
2
|
+
function parseState(raw) {
|
|
3
|
+
if (!isRecord(raw))
|
|
4
|
+
return { status: undefined, error: undefined };
|
|
5
|
+
const state = raw["state"];
|
|
6
|
+
if (state === "running")
|
|
7
|
+
return { status: "running", error: undefined };
|
|
8
|
+
if (state === "requires_action")
|
|
9
|
+
return { status: "waiting", error: undefined };
|
|
10
|
+
if (state !== "idle")
|
|
11
|
+
return { status: undefined, error: undefined };
|
|
12
|
+
const stopReason = raw["stopReason"];
|
|
13
|
+
const error = isRecord(raw["error"]) ? asTrimmedString(raw["error"]["message"]) : undefined;
|
|
14
|
+
if (stopReason === "error" || isRecord(raw["error"]))
|
|
15
|
+
return { status: "failed", error };
|
|
16
|
+
if (stopReason === "cancelled")
|
|
17
|
+
return { status: "cancelled", error: undefined };
|
|
18
|
+
return { status: "idle", error: undefined };
|
|
19
|
+
}
|
|
20
|
+
/** 子会话在名单上的身份字段:每条事件都重复带上。 */
|
|
21
|
+
function childLinkage(childId, record) {
|
|
22
|
+
return {
|
|
23
|
+
taskType: "subagent",
|
|
24
|
+
rosterKind: "subagent",
|
|
25
|
+
nativeSessionId: childId,
|
|
26
|
+
timelineBypass: true,
|
|
27
|
+
...(record.title === undefined ? {} : { title: record.title }),
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
export function createSubagentSessionTracker(registry) {
|
|
31
|
+
const observe = (notification, ctx) => {
|
|
32
|
+
const update = notification.update;
|
|
33
|
+
if (!isRecord(update) || update["sessionUpdate"] !== "subagent_update")
|
|
34
|
+
return [];
|
|
35
|
+
const childId = asTrimmedString(update["sessionId"]);
|
|
36
|
+
if (childId === undefined || ctx.ownSessionIds.has(childId))
|
|
37
|
+
return [];
|
|
38
|
+
const outerId = notification.sessionId;
|
|
39
|
+
const nested = registry.has(outerId);
|
|
40
|
+
if (ctx.foreign && !nested)
|
|
41
|
+
return [];
|
|
42
|
+
if (outerId === childId)
|
|
43
|
+
return [];
|
|
44
|
+
const title = asTrimmedString(update["title"]);
|
|
45
|
+
const description = asTrimmedString(update["description"]);
|
|
46
|
+
const state = parseState(update["state"]);
|
|
47
|
+
let record = registry.get(childId);
|
|
48
|
+
if (record === undefined) {
|
|
49
|
+
record = {
|
|
50
|
+
turnId: ctx.turnId,
|
|
51
|
+
title,
|
|
52
|
+
description,
|
|
53
|
+
parentAgentId: nested ? outerId : undefined,
|
|
54
|
+
observed: state.status,
|
|
55
|
+
reported: undefined,
|
|
56
|
+
reportedError: undefined,
|
|
57
|
+
// 重放里恢复的身份:宿主早有这一行,不再发 started。
|
|
58
|
+
announced: ctx.silent,
|
|
59
|
+
pendingMetadata: false,
|
|
60
|
+
};
|
|
61
|
+
registry.add(childId, record);
|
|
62
|
+
}
|
|
63
|
+
record.turnId ??= ctx.turnId;
|
|
64
|
+
if (!ctx.silent) {
|
|
65
|
+
if ((title !== undefined && title !== record.title) ||
|
|
66
|
+
(description !== undefined && description !== record.description)) {
|
|
67
|
+
record.pendingMetadata = true;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
if (title !== undefined)
|
|
71
|
+
record.title = title;
|
|
72
|
+
if (description !== undefined)
|
|
73
|
+
record.description = description;
|
|
74
|
+
if (state.status !== undefined)
|
|
75
|
+
record.observed = state.status;
|
|
76
|
+
if (ctx.silent)
|
|
77
|
+
return [];
|
|
78
|
+
const linkage = childLinkage(childId, record);
|
|
79
|
+
const turn = record.turnId === undefined ? {} : { turnId: record.turnId };
|
|
80
|
+
const events = [];
|
|
81
|
+
// started 带「重新开始」的语义,会把已经 idle 的行拉回运行:没见过明确状态就先不发。
|
|
82
|
+
if (!record.announced && state.status === undefined)
|
|
83
|
+
return events;
|
|
84
|
+
if (!record.announced) {
|
|
85
|
+
record.announced = true;
|
|
86
|
+
record.pendingMetadata = false;
|
|
87
|
+
events.push({
|
|
88
|
+
type: "task.started",
|
|
89
|
+
...turn,
|
|
90
|
+
payload: {
|
|
91
|
+
taskId: childId,
|
|
92
|
+
...linkage,
|
|
93
|
+
...(record.description === undefined ? {} : { description: record.description }),
|
|
94
|
+
},
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
// 状态或错误详情变了才报;首次明确状态也要明说,宿主才会重开从终态回来的行。重放观察到的不算已报。
|
|
98
|
+
const statusChanged = state.status !== undefined &&
|
|
99
|
+
(state.status !== record.reported ||
|
|
100
|
+
record.pendingMetadata ||
|
|
101
|
+
(state.error !== undefined && state.error !== record.reportedError));
|
|
102
|
+
if (statusChanged) {
|
|
103
|
+
record.pendingMetadata = false;
|
|
104
|
+
record.reported = state.status;
|
|
105
|
+
// 错误详情只属于当前这一轮失败;离开 failed 就清掉,下一次失败的详情才不会被当成重复。
|
|
106
|
+
record.reportedError =
|
|
107
|
+
state.status === "failed" ? (state.error ?? record.reportedError) : undefined;
|
|
108
|
+
events.push({
|
|
109
|
+
type: "task.updated",
|
|
110
|
+
...turn,
|
|
111
|
+
payload: {
|
|
112
|
+
taskId: childId,
|
|
113
|
+
status: state.status,
|
|
114
|
+
...(state.error === undefined ? {} : { error: state.error }),
|
|
115
|
+
...(record.description === undefined ? {} : { description: record.description }),
|
|
116
|
+
...linkage,
|
|
117
|
+
},
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
return events;
|
|
121
|
+
};
|
|
122
|
+
const settleSessionEnded = () => {
|
|
123
|
+
const events = [];
|
|
124
|
+
for (const [childId, record] of registry.entries()) {
|
|
125
|
+
// 重放里恢复、这一程没再报过的,以重放观察到的为准:上一程可能没来得及收尾。
|
|
126
|
+
const last = record.reported ?? record.observed;
|
|
127
|
+
if (!record.announced || (last !== "running" && last !== "waiting"))
|
|
128
|
+
continue;
|
|
129
|
+
record.reported = "idle";
|
|
130
|
+
record.observed = "idle";
|
|
131
|
+
events.push({
|
|
132
|
+
type: "task.updated",
|
|
133
|
+
...(record.turnId === undefined ? {} : { turnId: record.turnId }),
|
|
134
|
+
payload: {
|
|
135
|
+
taskId: childId,
|
|
136
|
+
status: "idle",
|
|
137
|
+
outcomeUnknown: true,
|
|
138
|
+
...(record.description === undefined ? {} : { description: record.description }),
|
|
139
|
+
...childLinkage(childId, record),
|
|
140
|
+
},
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
return events;
|
|
144
|
+
};
|
|
145
|
+
return { observe, settleSessionEnded };
|
|
146
|
+
}
|
|
147
|
+
//# sourceMappingURL=subagent-sessions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subagent-sessions.js","sourceRoot":"","sources":["../../src/executor/subagent-sessions.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import { type AcpAvailableCommand, type AcpSessionModeState } from "../runtime-m
|
|
|
9
9
|
import type { AcpSessionStartResult, AcpSessionStatus } from "../types.ts";
|
|
10
10
|
import { type PendingUserInput } from "../user-input-pending.ts";
|
|
11
11
|
import { type AcpVendorHooks } from "../vendor-hooks.ts";
|
|
12
|
+
import type { ChildSessionRegistry } from "./child-sessions.ts";
|
|
12
13
|
/** 已登记结果收尾与进程退出后等入流关闭共用这一上限。 */
|
|
13
14
|
export declare const DEFAULT_RESULT_DRAIN_TIMEOUT_MS = 2000;
|
|
14
15
|
type AssistantSegmentState = {
|
|
@@ -67,6 +68,18 @@ export type AcpExecutorState = {
|
|
|
67
68
|
*/
|
|
68
69
|
sessionLoadInFlight: boolean;
|
|
69
70
|
droppedReplayUpdates: number;
|
|
71
|
+
/**
|
|
72
|
+
* 这个执行器开过的每个会话 id(新开、加载、续接、换型号重开)。旧会话的晚到更新仍属本线程;
|
|
73
|
+
* 只有从没开过的会话(子 agent 的独立会话)发来的才算别的会话。
|
|
74
|
+
*/
|
|
75
|
+
ownSessionIds: Set<string>;
|
|
76
|
+
/**
|
|
77
|
+
* 已知的子会话 id(内置追踪器认出的,加上厂商钩子登记的)。它们无论有没有开会话请求在途都算别的会话,
|
|
78
|
+
* 不并进本线程;有界。
|
|
79
|
+
*/
|
|
80
|
+
childSessions: ChildSessionRegistry;
|
|
81
|
+
/** 等着应答的开会话请求数。新会话的 id 要等应答才知道,期间不判别的会话。 */
|
|
82
|
+
sessionOpensInFlight: number;
|
|
70
83
|
};
|
|
71
84
|
export type AcpExecutorSupport = {
|
|
72
85
|
randomId: () => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../src/executor/support.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACzF,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../src/executor/support.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"support.js","sourceRoot":"","sources":["../../src/executor/support.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,qCAAqC;AACrC,uCAAuC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAgC,MAAM,cAAc,CAAC;AAE5D,OAAO,EAA+B,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAoE,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAAsD,MAAM,qBAAqB,CAAC;AAEzF,OAAO,EAAyB,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAuB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"support.js","sourceRoot":"","sources":["../../src/executor/support.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,qCAAqC;AACrC,uCAAuC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAgC,MAAM,cAAc,CAAC;AAE5D,OAAO,EAA+B,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAoE,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAAsD,MAAM,qBAAqB,CAAC;AAEzF,OAAO,EAAyB,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAuB,MAAM,oBAAoB,CAAC;AAGzD,gCAAgC;AAChC,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,CAAC"}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import { type SessionNotification } from "../protocol.ts";
|
|
2
|
+
import { type AcpToolSubagentSettlement } from "../tool-subagents.ts";
|
|
2
3
|
import type { createExecutorRuntime } from "./runtime.ts";
|
|
3
4
|
import type { AcpExecutorSupport, CompactionRecord } from "./support.ts";
|
|
4
5
|
export declare function createExecutorUpdates({ emit, stamp, options, nowMs, compactions, randomId, toolCalls, hooks, emitArtifacts, closeActiveAssistantSegment, ensureActiveAssistantSegment, shared, }: Pick<AcpExecutorSupport, "options" | "nowMs" | "compactions" | "randomId" | "toolCalls" | "hooks" | "shared"> & Pick<ReturnType<typeof createExecutorRuntime>, "emit" | "stamp" | "emitArtifacts" | "closeActiveAssistantSegment" | "ensureActiveAssistantSegment">): {
|
|
5
6
|
emitCompactionState: (record: CompactionRecord, state: "compacting" | "compacted") => void;
|
|
6
|
-
|
|
7
|
+
receiveSessionUpdate: (params: SessionNotification) => void;
|
|
8
|
+
receiveExtensionNotification: (method: string, params: unknown) => void;
|
|
9
|
+
settleToolSubagents: (settlement: AcpToolSubagentSettlement, turnId?: string) => void;
|
|
10
|
+
settleSessionEnded: () => void;
|
|
11
|
+
toolSubagentsMayRun: () => boolean;
|
|
7
12
|
};
|
|
8
13
|
//# sourceMappingURL=updates.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updates.d.ts","sourceRoot":"","sources":["../../src/executor/updates.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAKzE,wBAAgB,qBAAqB,CAAC,EACpC,IAAI,EACJ,KAAK,EACL,OAAO,EACP,KAAK,EACL,WAAW,EACX,QAAQ,EACR,SAAS,EACT,KAAK,EACL,aAAa,EACb,2BAA2B,EAC3B,4BAA4B,EAC5B,MAAM,GACP,EAAE,IAAI,CACL,kBAAkB,EAClB,SAAS,GAAG,OAAO,GAAG,aAAa,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,GAAG,QAAQ,CACpF,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,MAAM,GACN,OAAO,GACP,eAAe,GACf,6BAA6B,GAC7B,8BAA8B,CACjC;
|
|
1
|
+
{"version":3,"file":"updates.d.ts","sourceRoot":"","sources":["../../src/executor/updates.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,EAA6B,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAGjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAKzE,wBAAgB,qBAAqB,CAAC,EACpC,IAAI,EACJ,KAAK,EACL,OAAO,EACP,KAAK,EACL,WAAW,EACX,QAAQ,EACR,SAAS,EACT,KAAK,EACL,aAAa,EACb,2BAA2B,EAC3B,4BAA4B,EAC5B,MAAM,GACP,EAAE,IAAI,CACL,kBAAkB,EAClB,SAAS,GAAG,OAAO,GAAG,aAAa,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,GAAG,QAAQ,CACpF,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,MAAM,GACN,OAAO,GACP,eAAe,GACf,6BAA6B,GAC7B,8BAA8B,CACjC;kCAUS,gBAAgB,SACjB,YAAY,GAAG,WAAW,KAChC,IAAI;mCAiS+B,mBAAmB,KAAG,IAAI;2CAuBlB,MAAM,UAAU,OAAO,KAAG,IAAI;sCApMnC,yBAAyB,WAAW,MAAM,KAAG,IAAI;8BAI3D,IAAI;+BA4MR,OAAO;EAEnC"}
|
package/dist/executor/updates.js
CHANGED
|
@@ -5,11 +5,17 @@ import { resourceLinkArtifacts } from "../artifacts.js";
|
|
|
5
5
|
import { makeAcpContentDeltaEvent, makeAcpPlanUpdatedEvent, makeAcpToolCallEvent, retainToolCallUpdate, } from "../events.js";
|
|
6
6
|
import {} from "../protocol.js";
|
|
7
7
|
import { parseAvailableCommandsUpdate, parseSessionUpdateEvent } from "../runtime-model.js";
|
|
8
|
+
import { createToolSubagentTracker } from "../tool-subagents.js";
|
|
9
|
+
import { createSubagentSessionTracker } from "./subagent-sessions.js";
|
|
8
10
|
const COMPACTION_SUMMARY_MAX_CHARS = 8_000;
|
|
9
11
|
const SHOWN_TOOL_CALL_LIMIT = 256;
|
|
10
12
|
export function createExecutorUpdates({ emit, stamp, options, nowMs, compactions, randomId, toolCalls, hooks, emitArtifacts, closeActiveAssistantSegment, ensureActiveAssistantSegment, shared, }) {
|
|
11
13
|
/** 已经发过工具事件的调用 id,有界。晚到的更新靠它认出「不是新调用」。 */
|
|
12
14
|
const shownToolCallIds = new Set();
|
|
15
|
+
const markChildSession = shared.childSessions.mark;
|
|
16
|
+
const subagentSessions = options.subagentSessions === true
|
|
17
|
+
? createSubagentSessionTracker(shared.childSessions)
|
|
18
|
+
: undefined;
|
|
13
19
|
const emitCompactionState = (record, state) => {
|
|
14
20
|
const summary = record.summary?.trim() ?? "";
|
|
15
21
|
const truncated = summary.length > COMPACTION_SUMMARY_MAX_CHARS;
|
|
@@ -105,6 +111,33 @@ export function createExecutorUpdates({ emit, stamp, options, nowMs, compactions
|
|
|
105
111
|
return;
|
|
106
112
|
}
|
|
107
113
|
};
|
|
114
|
+
/** 钩子翻出的任务事件;通用机只补身份与时间戳。 */
|
|
115
|
+
const emitTaskEvents = (taskEvents) => {
|
|
116
|
+
for (const taskEvent of taskEvents ?? []) {
|
|
117
|
+
emit({
|
|
118
|
+
type: taskEvent.type,
|
|
119
|
+
...stamp(),
|
|
120
|
+
provider: options.provider,
|
|
121
|
+
threadId: options.threadId,
|
|
122
|
+
...(taskEvent.turnId !== undefined ? { turnId: taskEvent.turnId } : {}),
|
|
123
|
+
payload: taskEvent.payload,
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
};
|
|
127
|
+
const toolSubagents = hooks.toolSubagents === undefined ? undefined : createToolSubagentTracker(hooks.toolSubagents);
|
|
128
|
+
/** 工具调用型子 agent 的收尾,排在触发它的 `turn.completed` / `session.exited` 之前。 */
|
|
129
|
+
const settleToolSubagents = (settlement, turnId) => emitTaskEvents(toolSubagents?.settle(settlement, turnId));
|
|
130
|
+
/** 会话结束:每种子 agent 都给还开着的留一条结论,排在 `session.exited` 之前。 */
|
|
131
|
+
const settleSessionEnded = () => {
|
|
132
|
+
settleToolSubagents("session-ended");
|
|
133
|
+
emitTaskEvents(subagentSessions?.settleSessionEnded());
|
|
134
|
+
emitTaskEvents(hooks.onSessionEnded?.());
|
|
135
|
+
};
|
|
136
|
+
const observeContext = () => ({
|
|
137
|
+
turnId: shared.activeTurnId,
|
|
138
|
+
sessionId: shared.sessionId,
|
|
139
|
+
markChildSession,
|
|
140
|
+
});
|
|
108
141
|
const handleSessionUpdate = (params) => {
|
|
109
142
|
const parsed = parseSessionUpdateEvent(params);
|
|
110
143
|
if (parsed.modeId && shared.modeState) {
|
|
@@ -130,43 +163,44 @@ export function createExecutorUpdates({ emit, stamp, options, nowMs, compactions
|
|
|
130
163
|
nowMs,
|
|
131
164
|
});
|
|
132
165
|
// 后台任务(监视器、后台 shell)的生命周期只在工具结果里:不论这次更新发不发工具事件,都要过一遍,轮询通知常常只带 rawOutput。
|
|
133
|
-
const
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
166
|
+
const hasToolHooks = toolSubagents !== undefined || hooks.onToolCallUpdated !== undefined;
|
|
167
|
+
const call = !hasToolHooks
|
|
168
|
+
? undefined
|
|
169
|
+
: {
|
|
170
|
+
toolCallId: nextToolCall.toolCallId,
|
|
171
|
+
status: nextToolCall.status,
|
|
172
|
+
title: nextToolCall.title,
|
|
173
|
+
kind: nextToolCall.kind,
|
|
174
|
+
rawInput: nextToolCall.data["rawInput"],
|
|
175
|
+
rawOutput: nextToolCall.data["rawOutput"],
|
|
176
|
+
contentText: nextToolCall.contentText,
|
|
177
|
+
meta: params.update._meta,
|
|
178
|
+
turnId: shared.activeTurnId,
|
|
179
|
+
};
|
|
180
|
+
const hookResult = call === undefined
|
|
181
|
+
? undefined
|
|
182
|
+
: (toolSubagents?.onToolCallUpdated(call) ?? hooks.onToolCallUpdated?.(call));
|
|
144
183
|
const handledByHook = hookResult !== undefined && "events" in hookResult && hookResult.handled === true;
|
|
145
|
-
|
|
146
|
-
emit({
|
|
147
|
-
type: taskEvent.type,
|
|
148
|
-
...stamp(),
|
|
149
|
-
provider: options.provider,
|
|
150
|
-
threadId: options.threadId,
|
|
151
|
-
...(taskEvent.turnId !== undefined ? { turnId: taskEvent.turnId } : {}),
|
|
152
|
-
payload: taskEvent.payload,
|
|
153
|
-
});
|
|
154
|
-
}
|
|
184
|
+
emitTaskEvents(hookResult === undefined ? [] : "events" in hookResult ? hookResult.events : hookResult);
|
|
155
185
|
if (nextToolCall.status === "completed" && hookResult && "artifacts" in hookResult)
|
|
156
186
|
emitArtifacts(hookResult.artifacts ?? [], nextToolCall.toolCallId);
|
|
157
187
|
if (handledByHook || !decision.emit) {
|
|
158
188
|
continue;
|
|
159
189
|
}
|
|
160
|
-
|
|
190
|
+
const toolTurnId = (hookResult !== undefined && "events" in hookResult ? hookResult.turnId : undefined) ??
|
|
191
|
+
shared.activeTurnId;
|
|
192
|
+
// 当前轮的新工具调用才是回答里的分界:已经露过面的调用再报进度(比如后台命令跑完)、
|
|
193
|
+
// 属于更早一轮的晚到结果都不是,不能把这一轮的回答从中间劈开。
|
|
161
194
|
if (!shownToolCallIds.has(nextToolCall.toolCallId)) {
|
|
162
195
|
rememberShownToolCall(nextToolCall.toolCallId);
|
|
163
|
-
|
|
196
|
+
if (toolTurnId === shared.activeTurnId)
|
|
197
|
+
closeActiveAssistantSegment(shared.activeTurnId);
|
|
164
198
|
}
|
|
165
199
|
emit(makeAcpToolCallEvent({
|
|
166
200
|
stamp: stamp(),
|
|
167
201
|
provider: options.provider,
|
|
168
202
|
threadId: options.threadId,
|
|
169
|
-
turnId:
|
|
203
|
+
turnId: toolTurnId,
|
|
170
204
|
toolCall: nextToolCall,
|
|
171
205
|
rawPayload: event.rawPayload,
|
|
172
206
|
}));
|
|
@@ -240,6 +274,46 @@ export function createExecutorUpdates({ emit, stamp, options, nowMs, compactions
|
|
|
240
274
|
}
|
|
241
275
|
}
|
|
242
276
|
};
|
|
243
|
-
|
|
277
|
+
/**
|
|
278
|
+
* 进通用机的每条 `session/update`。别的会话发来的(子 agent 在同一条连接上的独立会话)
|
|
279
|
+
* 只交给厂商钩子读,不并进本线程:否则子 agent 的回答与工具调用会显示成本会话 agent 做的。
|
|
280
|
+
* 「别的会话」= 已知的子会话,或本执行器从没开过的会话;有开会话请求在途时(新会话 id 还不知道),
|
|
281
|
+
* 没见过的 id 不分辨,已知子会话照旧隔离。
|
|
282
|
+
*/
|
|
283
|
+
const receiveSessionUpdate = (params) => {
|
|
284
|
+
const foreign = !shared.ownSessionIds.has(params.sessionId) &&
|
|
285
|
+
(shared.childSessions.has(params.sessionId) ||
|
|
286
|
+
(shared.sessionOpensInFlight === 0 && shared.ownSessionIds.size > 0));
|
|
287
|
+
// 重放窗口里追踪器也要读:静默恢复子会话的身份与父子关系,后面的实时更新才接得上。
|
|
288
|
+
emitTaskEvents(subagentSessions?.observe(params, {
|
|
289
|
+
turnId: shared.activeTurnId,
|
|
290
|
+
foreign,
|
|
291
|
+
ownSessionIds: shared.ownSessionIds,
|
|
292
|
+
silent: shared.sessionLoadInFlight,
|
|
293
|
+
}));
|
|
294
|
+
if (!shared.sessionLoadInFlight) {
|
|
295
|
+
if (hooks.onSessionUpdate) {
|
|
296
|
+
emitTaskEvents(hooks.onSessionUpdate(params, { ...observeContext(), foreign }));
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
if (!foreign)
|
|
300
|
+
handleSessionUpdate(params);
|
|
301
|
+
};
|
|
302
|
+
/** 不是收口信号的扩展通知;重放窗口内不交给钩子。 */
|
|
303
|
+
const receiveExtensionNotification = (method, params) => {
|
|
304
|
+
if (shared.sessionLoadInFlight || !hooks.onExtensionNotification)
|
|
305
|
+
return;
|
|
306
|
+
const result = hooks.onExtensionNotification(method, params, observeContext());
|
|
307
|
+
if (Array.isArray(result))
|
|
308
|
+
emitTaskEvents(result);
|
|
309
|
+
};
|
|
310
|
+
return {
|
|
311
|
+
emitCompactionState,
|
|
312
|
+
receiveSessionUpdate,
|
|
313
|
+
receiveExtensionNotification,
|
|
314
|
+
settleToolSubagents,
|
|
315
|
+
settleSessionEnded,
|
|
316
|
+
toolSubagentsMayRun: () => toolSubagents?.mayStillRun() ?? false,
|
|
317
|
+
};
|
|
244
318
|
}
|
|
245
319
|
//# sourceMappingURL=updates.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updates.js","sourceRoot":"","sources":["../../src/executor/updates.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"updates.js","sourceRoot":"","sources":["../../src/executor/updates.ts"],"names":[],"mappings":"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"}
|
package/dist/executor.d.ts
CHANGED
|
@@ -36,6 +36,11 @@ export type AcpExecutorOptions = {
|
|
|
36
36
|
readonly terminal?: boolean;
|
|
37
37
|
readonly [key: string]: unknown;
|
|
38
38
|
};
|
|
39
|
+
/**
|
|
40
|
+
* 跟踪 ACP 子会话(草案 Subagent Sessions,尚未定稿)。为真时 `initialize` 声明 `subagents`,
|
|
41
|
+
* 并把父会话上的 `subagent_update` 翻成 `task.*`。默认关:关着时线上字节与行为不变。
|
|
42
|
+
*/
|
|
43
|
+
readonly subagentSessions?: boolean;
|
|
39
44
|
readonly hooks?: AcpVendorHooks;
|
|
40
45
|
/**
|
|
41
46
|
* agent 子进程 stderr 的末尾(已脱敏,见 plugin-api 的 `nodeStreamsFromHandle`)。会话还没
|
|
@@ -126,6 +131,11 @@ export type AcpExecutor = {
|
|
|
126
131
|
}): Promise<void>;
|
|
127
132
|
/** 这一轮还在跑的工具调用。只出事实:哪条算命令、argv 什么样由插件判,不带 pid。 */
|
|
128
133
|
openToolCalls(): ReadonlyArray<AcpOpenToolCall>;
|
|
134
|
+
/**
|
|
135
|
+
* 工具调用型子 agent(`hooks.toolSubagents`)里还有没拿到结局的:在跑的,或一轮结束后状态未知的。
|
|
136
|
+
* 打断停不掉子 agent 的 agent 据此决定停止时要不要结束整个会话。
|
|
137
|
+
*/
|
|
138
|
+
toolSubagentsMayRun(): boolean;
|
|
129
139
|
/** 只有已确认的进程自行退出才传退出码;用户 stop / dispose 不传。 */
|
|
130
140
|
dispose(exitCode?: number | null): Promise<void>;
|
|
131
141
|
};
|
package/dist/executor.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,UAAU,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,UAAU,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAe/C,OAAO,EAAqB,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAML,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EAGxB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACzF,OAAO,KAAK,EACV,mBAAmB,EACnB,cAAc,EACd,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAI5E,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC;IACvC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACzE,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,cAAc,GAAG,gBAAgB,CAAC;IAC1D,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;QAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,CAAC;IACjG;;;OAGG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACvD,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,gBAAgB,EAAE,kBAAkB,KAAK,MAAM,GAAG,SAAS,CAAC,CAAC;IAChG,QAAQ,CAAC,kBAAkB,CAAC,EAAE;QAC5B,QAAQ,CAAC,EAAE,CAAC,EAAE;YAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;YAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC;QACpF,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAC5B,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACjC,CAAC;IACF;;;OAGG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;IAChC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD;;;;OAIG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC;IAClE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC;;;;OAIG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD;;;OAGG;IACH,QAAQ,CAAC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IAC/C;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,mBAAmB,CAAC,KAAK,IAAI,CAAC;IACtF,+BAA+B;IAC/B,QAAQ,CAAC,GAAG,CAAC,EAAE;QACb,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC;QACrF,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC;KACvF,CAAC;IACF;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC5D,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,mCAAmC;IACnC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,MAAM,CAAC;IACjC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAC1C;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC;IAC9C,KAAK,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACtD,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,gBAAgB,CACd,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,mBAAmB,EAC7B,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE;;;;;OAKG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,kDAAkD;IAClD,aAAa,IAAI,aAAa,CAAC,eAAe,CAAC,CAAC;IAChD;;;OAGG;IACH,mBAAmB,IAAI,OAAO,CAAC;IAC/B,8CAA8C;IAC9C,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAUF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,CAsU1E;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAE5E"}
|
package/dist/executor.js
CHANGED
|
@@ -6,6 +6,7 @@ import { createApprovalGate } from "./approvals.js";
|
|
|
6
6
|
import { AcpExecutorError } from "./errors.js";
|
|
7
7
|
import { UnboundedEventStream } from "./event-stream.js";
|
|
8
8
|
import {} from "./events.js";
|
|
9
|
+
import { createChildSessionRegistry } from "./executor/child-sessions.js";
|
|
9
10
|
import { createExecutorLifecycle } from "./executor/lifecycle.js";
|
|
10
11
|
import { createExecutorPrompt } from "./executor/prompt.js";
|
|
11
12
|
import { createPromptResults } from "./executor/prompt-results.js";
|
|
@@ -65,6 +66,9 @@ export function createAcpExecutor(options) {
|
|
|
65
66
|
connectionClosed: false,
|
|
66
67
|
sessionLoadInFlight: false,
|
|
67
68
|
droppedReplayUpdates: 0,
|
|
69
|
+
ownSessionIds: new Set(),
|
|
70
|
+
childSessions: createChildSessionRegistry(),
|
|
71
|
+
sessionOpensInFlight: 0,
|
|
68
72
|
};
|
|
69
73
|
const interruptedTurnIds = new Set();
|
|
70
74
|
const approvals = createApprovalGate({
|
|
@@ -86,7 +90,7 @@ export function createAcpExecutor(options) {
|
|
|
86
90
|
promptMutex,
|
|
87
91
|
shared,
|
|
88
92
|
});
|
|
89
|
-
const { emitCompactionState,
|
|
93
|
+
const { emitCompactionState, receiveSessionUpdate, receiveExtensionNotification, settleToolSubagents, settleSessionEnded, toolSubagentsMayRun, } = createExecutorUpdates({
|
|
90
94
|
emit,
|
|
91
95
|
stamp,
|
|
92
96
|
options,
|
|
@@ -152,12 +156,12 @@ export function createAcpExecutor(options) {
|
|
|
152
156
|
? hooks.transformSessionUpdate(params)
|
|
153
157
|
: params;
|
|
154
158
|
if (transformed !== undefined)
|
|
155
|
-
|
|
159
|
+
receiveSessionUpdate(transformed);
|
|
156
160
|
return;
|
|
157
161
|
}
|
|
158
162
|
if (settleFromNotification(notification.method, notification.params))
|
|
159
163
|
return;
|
|
160
|
-
|
|
164
|
+
receiveExtensionNotification(notification.method, notification.params);
|
|
161
165
|
},
|
|
162
166
|
onRequest: async (method, params) => {
|
|
163
167
|
if (method === CLIENT_METHODS.session_request_permission) {
|
|
@@ -212,6 +216,7 @@ export function createAcpExecutor(options) {
|
|
|
212
216
|
});
|
|
213
217
|
const { sendPromptRpc, prompt } = createExecutorPrompt({
|
|
214
218
|
promptResults,
|
|
219
|
+
settleToolSubagents,
|
|
215
220
|
isLive,
|
|
216
221
|
closeActiveAssistantSegment,
|
|
217
222
|
emit,
|
|
@@ -232,6 +237,8 @@ export function createAcpExecutor(options) {
|
|
|
232
237
|
});
|
|
233
238
|
const { cancel, compact, dispose: disposeLifecycle, } = createExecutorLifecycle({
|
|
234
239
|
promptResults,
|
|
240
|
+
settleToolSubagents,
|
|
241
|
+
settleSessionEnded,
|
|
235
242
|
failIfDisposed,
|
|
236
243
|
requireStarted,
|
|
237
244
|
interruptedTurnIds,
|
|
@@ -280,6 +287,7 @@ export function createAcpExecutor(options) {
|
|
|
280
287
|
setNativeMode,
|
|
281
288
|
compact,
|
|
282
289
|
openToolCalls: () => readOpenToolCalls(toolCalls, shared.activeTurnId),
|
|
290
|
+
toolSubagentsMayRun,
|
|
283
291
|
dispose: (exitCode) => {
|
|
284
292
|
// 同一轮清理只跑一次,调用方拿到的永远是同一个 Promise(与 disposeLifecycle 的
|
|
285
293
|
// 契约一致;调试用的文件句柄也算在这次清理里)。
|
package/dist/executor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,qCAAqC;AACrC,uCAAuC;AACvC,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAgC,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAwB,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EACL,cAAc,EACd,YAAY,EACZ,mBAAmB,GAOpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAuD,MAAM,oBAAoB,CAAC;AASzF,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAuB,MAAM,mBAAmB,CAAC;AAE5E,MAAM,uBAAuB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
|
package/dist/handshake.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ export type AcpClientCapabilityOverrides = {
|
|
|
8
8
|
readonly writeTextFile?: boolean;
|
|
9
9
|
};
|
|
10
10
|
readonly terminal?: boolean;
|
|
11
|
+
readonly subagents?: boolean;
|
|
11
12
|
};
|
|
12
13
|
export type AcpInitializePayload = {
|
|
13
14
|
readonly protocolVersion: number;
|
|
@@ -17,8 +18,14 @@ export type AcpInitializePayload = {
|
|
|
17
18
|
readonly writeTextFile: boolean;
|
|
18
19
|
};
|
|
19
20
|
readonly terminal: boolean;
|
|
21
|
+
readonly subagents?: Record<string, never>;
|
|
20
22
|
};
|
|
21
23
|
readonly clientInfo: AcpClientInfo;
|
|
22
24
|
};
|
|
23
25
|
export declare function acpInitializePayload(clientInfo: AcpClientInfo, overrides?: AcpClientCapabilityOverrides): AcpInitializePayload;
|
|
26
|
+
/** 执行器与探测共用:把 `subagentSessions` 并进客户端能力覆盖,两条路径问的是同一个问题。 */
|
|
27
|
+
export declare function acpCapabilityOverrides(input: {
|
|
28
|
+
readonly clientCapabilities?: AcpClientCapabilityOverrides | undefined;
|
|
29
|
+
readonly subagentSessions?: boolean | undefined;
|
|
30
|
+
}): AcpClientCapabilityOverrides | undefined;
|
|
24
31
|
//# sourceMappingURL=handshake.d.ts.map
|