ycodium-acp-executor 0.2.3080 → 0.2.3088
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/dist/executor/lifecycle.d.ts +15 -0
- package/dist/executor/lifecycle.d.ts.map +1 -0
- package/dist/executor/lifecycle.js +150 -0
- package/dist/executor/lifecycle.js.map +1 -0
- package/dist/executor/prompt.d.ts +11 -0
- package/dist/executor/prompt.d.ts.map +1 -0
- package/dist/executor/prompt.js +283 -0
- package/dist/executor/prompt.js.map +1 -0
- package/dist/executor/requests.d.ts +13 -0
- package/dist/executor/requests.d.ts.map +1 -0
- package/dist/executor/requests.js +215 -0
- package/dist/executor/requests.js.map +1 -0
- package/dist/executor/runtime.d.ts +14 -0
- package/dist/executor/runtime.d.ts.map +1 -0
- package/dist/executor/runtime.js +103 -0
- package/dist/executor/runtime.js.map +1 -0
- package/dist/executor/session.d.ts +19 -0
- package/dist/executor/session.d.ts.map +1 -0
- package/dist/executor/session.js +225 -0
- package/dist/executor/session.js.map +1 -0
- package/dist/executor/settlement.d.ts +8 -0
- package/dist/executor/settlement.d.ts.map +1 -0
- package/dist/executor/settlement.js +70 -0
- package/dist/executor/settlement.js.map +1 -0
- package/dist/executor/support.d.ts +88 -0
- package/dist/executor/support.d.ts.map +1 -0
- package/dist/executor/support.js +13 -0
- package/dist/executor/support.js.map +1 -0
- package/dist/executor/updates.d.ts +8 -0
- package/dist/executor/updates.d.ts.map +1 -0
- package/dist/executor/updates.js +245 -0
- package/dist/executor/updates.js.map +1 -0
- package/dist/executor.d.ts +1 -1
- package/dist/executor.d.ts.map +1 -1
- package/dist/executor.js +144 -1247
- package/dist/executor.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
// @effect-diagnostics nodeBuiltinImport:off
|
|
2
|
+
// @effect-diagnostics globalDate:off
|
|
3
|
+
// @effect-diagnostics globalTimers:off
|
|
4
|
+
import { AcpExecutorRequestError } from "../errors.js";
|
|
5
|
+
import { withFailureCategory } from "../failureCategory.js";
|
|
6
|
+
const SETTLED_PROMPT_KEY_LIMIT = 32;
|
|
7
|
+
export function createExecutorSettlement({ hooks, shared, }) {
|
|
8
|
+
/**
|
|
9
|
+
* 已经结算过的 promptKey。通知与 RPC 应答都可能带同一个 key 再来一次,
|
|
10
|
+
* 不记住就会把下一轮的等待错误地收掉。有界:只留最近这些。
|
|
11
|
+
*/
|
|
12
|
+
const settledPromptKeys = [];
|
|
13
|
+
const rememberSettledPromptKey = (key) => {
|
|
14
|
+
if (settledPromptKeys.includes(key))
|
|
15
|
+
return;
|
|
16
|
+
settledPromptKeys.push(key);
|
|
17
|
+
if (settledPromptKeys.length > SETTLED_PROMPT_KEY_LIMIT)
|
|
18
|
+
settledPromptKeys.shift();
|
|
19
|
+
};
|
|
20
|
+
/** 挂着的提前收口等待。四个清理点(流断 / 连接关 / 取消 / dispose)都要过它。 */
|
|
21
|
+
const abortPendingSettlement = (reason, failureCategory) => {
|
|
22
|
+
const waiting = shared.pendingSettlement;
|
|
23
|
+
if (waiting === undefined)
|
|
24
|
+
return;
|
|
25
|
+
shared.pendingSettlement = undefined;
|
|
26
|
+
waiting.settle({
|
|
27
|
+
error: withFailureCategory(new AcpExecutorRequestError("session/prompt", reason), failureCategory),
|
|
28
|
+
});
|
|
29
|
+
};
|
|
30
|
+
/**
|
|
31
|
+
* 一条通知能不能收掉这一轮。返回 true 表示它是收口信号,已消费。
|
|
32
|
+
*
|
|
33
|
+
* 四条语义都在这里,不外放给钩子——外放的话每家会各写一遍,而其中第三条有事故记录:
|
|
34
|
+
* 1. 带 key 按 key 配,不带 key 按 sessionId 配当前这一轮(Grok 的 promptId 是可选的)
|
|
35
|
+
* 2. 已结算过的 key 丢弃,防迟到的重复通知收掉下一轮
|
|
36
|
+
* 3. `error` 走失败通道,**绝不能归成正常结束**——Grok 额度耗尽正是发它,
|
|
37
|
+
* 归成成功的话用户看到一条空白回复(`cba38ce0d`)
|
|
38
|
+
* 4. 赢了之后输掉的那条 RPC 不会有人再等,交给 dispose/close 时的 rejectPending 收
|
|
39
|
+
*/
|
|
40
|
+
const settleFromNotification = (method, params) => {
|
|
41
|
+
const hook = hooks.promptSettlement;
|
|
42
|
+
if (hook === undefined || shared.pendingSettlement === undefined)
|
|
43
|
+
return false;
|
|
44
|
+
const signal = hook.fromNotification(method, params);
|
|
45
|
+
if (signal === undefined)
|
|
46
|
+
return false;
|
|
47
|
+
const waiting = shared.pendingSettlement;
|
|
48
|
+
if (signal.sessionId !== waiting.sessionId)
|
|
49
|
+
return false;
|
|
50
|
+
if (signal.promptKey !== undefined && signal.promptKey !== waiting.promptKey) {
|
|
51
|
+
// 不是这一轮的:可能是上一轮迟到的重复通知,消费掉但不结算。
|
|
52
|
+
return settledPromptKeys.includes(signal.promptKey);
|
|
53
|
+
}
|
|
54
|
+
shared.pendingSettlement = undefined;
|
|
55
|
+
rememberSettledPromptKey(waiting.promptKey);
|
|
56
|
+
if (signal.outcome === "error") {
|
|
57
|
+
waiting.settle({
|
|
58
|
+
error: withFailureCategory(new AcpExecutorRequestError("session/prompt", signal.detail ?? "prompt failed without an error detail"), signal.failureCategory),
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
waiting.settle({
|
|
63
|
+
response: { stopReason: signal.stopReason ?? "end_turn" },
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
return true;
|
|
67
|
+
};
|
|
68
|
+
return { rememberSettledPromptKey, abortPendingSettlement, settleFromNotification };
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=settlement.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settlement.js","sourceRoot":"","sources":["../../src/executor/settlement.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,qCAAqC;AACrC,uCAAuC;AACvC,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAA2B,MAAM,uBAAuB,CAAC;AAGrF,MAAM,wBAAwB,GAAG,EAAE,CAAC;AAEpC,MAAM,UAAU,wBAAwB,CAAC,EACvC,KAAK,EACL,MAAM,GACuC;IAC7C;;;OAGG;IACH,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAEvC,MAAM,wBAAwB,GAAG,CAAC,GAAW,EAAQ,EAAE;QACrD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO;QAC5C,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,iBAAiB,CAAC,MAAM,GAAG,wBAAwB;YAAE,iBAAiB,CAAC,KAAK,EAAE,CAAC;IACrF,CAAC,CAAC;IAEF,oDAAoD;IACpD,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,eAAoC,EAAQ,EAAE;QAC5F,MAAM,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC;QACzC,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO;QAClC,MAAM,CAAC,iBAAiB,GAAG,SAAS,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC;YACb,KAAK,EAAE,mBAAmB,CACxB,IAAI,uBAAuB,CAAC,gBAAgB,EAAE,MAAM,CAAC,EACrD,eAAe,CAChB;SACF,CAAC,CAAC;IACL,CAAC,CAAC;IAEF;;;;;;;;;OASG;IACH,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,MAAe,EAAW,EAAE;QAC1E,MAAM,IAAI,GAAG,KAAK,CAAC,gBAAgB,CAAC;QACpC,IAAI,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,iBAAiB,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrD,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAEvC,MAAM,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC;QACzC,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QACzD,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC;YAC7E,gCAAgC;YAChC,OAAO,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,CAAC,iBAAiB,GAAG,SAAS,CAAC;QACrC,wBAAwB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YAC/B,OAAO,CAAC,MAAM,CAAC;gBACb,KAAK,EAAE,mBAAmB,CACxB,IAAI,uBAAuB,CACzB,gBAAgB,EAChB,MAAM,CAAC,MAAM,IAAI,uCAAuC,CACzD,EACD,MAAM,CAAC,eAAe,CACvB;aACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC;gBACb,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,UAAU,EAAE;aAC1D,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;AACtF,CAAC"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { createApprovalGate } from "../approvals.ts";
|
|
2
|
+
import { UnboundedEventStream } from "../event-stream.ts";
|
|
3
|
+
import { type AcpToolCallTrackedState } from "../events.ts";
|
|
4
|
+
import type { AcpExecutorOptions } from "../executor.ts";
|
|
5
|
+
import { type AcpModelSelectionState } from "../model-selection.ts";
|
|
6
|
+
import { Mutex } from "../mutex.ts";
|
|
7
|
+
import { type AcpConnection, type InitializeResponse } from "../protocol.ts";
|
|
8
|
+
import { type AcpAvailableCommand, type AcpSessionModeState } from "../runtime-model.ts";
|
|
9
|
+
import type { AcpSessionStartResult, AcpSessionStatus } from "../types.ts";
|
|
10
|
+
import { type PendingUserInput } from "../user-input-pending.ts";
|
|
11
|
+
import { type AcpVendorHooks } from "../vendor-hooks.ts";
|
|
12
|
+
type AssistantSegmentState = {
|
|
13
|
+
nextSegmentIndex: number;
|
|
14
|
+
activeItemId?: string;
|
|
15
|
+
};
|
|
16
|
+
/** 一次压缩的累积状态:快照要把已知的全部字段带上,投影按 id 覆盖同一行。 */
|
|
17
|
+
export type CompactionRecord = {
|
|
18
|
+
readonly snapshotId: string;
|
|
19
|
+
readonly trigger: "manual" | "automatic";
|
|
20
|
+
readonly startedAtMs: number;
|
|
21
|
+
summary: string | undefined;
|
|
22
|
+
/** 「正在压缩」已经报出去了。 */
|
|
23
|
+
announced: boolean;
|
|
24
|
+
finished: boolean;
|
|
25
|
+
/** 仅手动那一条:agent 自报的压缩已经认领了它。 */
|
|
26
|
+
adopted: boolean;
|
|
27
|
+
};
|
|
28
|
+
export type AcpExecutorState = {
|
|
29
|
+
generation: number;
|
|
30
|
+
disposed: boolean;
|
|
31
|
+
status: AcpSessionStatus;
|
|
32
|
+
sessionId: string | undefined;
|
|
33
|
+
modelSelectionState: AcpModelSelectionState;
|
|
34
|
+
/** 上一个对不上目录的请求型号:同一个 id 每轮都来,日志只记一次。 */
|
|
35
|
+
lastUnmatchedModelId: string | undefined;
|
|
36
|
+
initializeResult: InitializeResponse | undefined;
|
|
37
|
+
startResult: AcpSessionStartResult | undefined;
|
|
38
|
+
startInFlight: Promise<AcpSessionStartResult> | undefined;
|
|
39
|
+
activeTurnId: string | undefined;
|
|
40
|
+
promptsInFlight: number;
|
|
41
|
+
/** 这一轮挂着的「提前收口」等待。同一时刻至多一条:prompt 之间有 promptMutex。 */
|
|
42
|
+
pendingSettlement: {
|
|
43
|
+
readonly promptKey: string;
|
|
44
|
+
readonly sessionId: string;
|
|
45
|
+
readonly settle: (outcome: {
|
|
46
|
+
readonly error?: Error;
|
|
47
|
+
readonly response?: unknown;
|
|
48
|
+
}) => void;
|
|
49
|
+
} | undefined;
|
|
50
|
+
/** 我们自己发命令触发的那一次;期间 agent 自报的第一条压缩并进它。 */
|
|
51
|
+
manualCompaction: CompactionRecord | undefined;
|
|
52
|
+
assistantSegment: AssistantSegmentState;
|
|
53
|
+
modeState: AcpSessionModeState | undefined;
|
|
54
|
+
availableCommands: ReadonlyArray<AcpAvailableCommand>;
|
|
55
|
+
promptWaiters: Array<() => void>;
|
|
56
|
+
abortLocalPrompt: (() => void) | undefined;
|
|
57
|
+
connectionClosed: boolean;
|
|
58
|
+
/**
|
|
59
|
+
* `session/load` 发出到应答到达之间为真。ACP 规定 agent 在应答之前把整段历史按
|
|
60
|
+
* `session/update` 重放一遍(用户消息、回复、思考、工具调用、计划);这些是已经发生过的
|
|
61
|
+
* 旧内容,当成本轮输出投影出去,每续一次会话就把之前的回复在新一轮开头再吐一遍。
|
|
62
|
+
* 只丢内容类更新,命令清单、模式这类状态照常处理。
|
|
63
|
+
*/
|
|
64
|
+
sessionLoadInFlight: boolean;
|
|
65
|
+
droppedReplayUpdates: number;
|
|
66
|
+
};
|
|
67
|
+
export type AcpExecutorSupport = {
|
|
68
|
+
randomId: () => string;
|
|
69
|
+
nowIso: () => string;
|
|
70
|
+
eventStream: UnboundedEventStream;
|
|
71
|
+
options: AcpExecutorOptions;
|
|
72
|
+
assistantItemRuntimeId: string;
|
|
73
|
+
promptMutex: Mutex;
|
|
74
|
+
shared: AcpExecutorState;
|
|
75
|
+
nowMs: () => number;
|
|
76
|
+
compactions: Map<string, CompactionRecord>;
|
|
77
|
+
toolCalls: Map<string, AcpToolCallTrackedState>;
|
|
78
|
+
hooks: AcpVendorHooks;
|
|
79
|
+
approvals: ReturnType<typeof createApprovalGate>;
|
|
80
|
+
pendingUserInputs: Map<string, PendingUserInput>;
|
|
81
|
+
connection: AcpConnection;
|
|
82
|
+
interruptedTurnIds: Set<string>;
|
|
83
|
+
threadMutex: Mutex;
|
|
84
|
+
cancelGraceMs: number;
|
|
85
|
+
onInputDead: () => void;
|
|
86
|
+
};
|
|
87
|
+
export {};
|
|
88
|
+
//# sourceMappingURL=support.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../src/executor/support.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
// @effect-diagnostics nodeBuiltinImport:off
|
|
2
|
+
// @effect-diagnostics globalDate:off
|
|
3
|
+
// @effect-diagnostics globalTimers:off
|
|
4
|
+
import { createApprovalGate } from "../approvals.js";
|
|
5
|
+
import { UnboundedEventStream } from "../event-stream.js";
|
|
6
|
+
import {} from "../events.js";
|
|
7
|
+
import {} from "../model-selection.js";
|
|
8
|
+
import { Mutex } from "../mutex.js";
|
|
9
|
+
import {} from "../protocol.js";
|
|
10
|
+
import {} from "../runtime-model.js";
|
|
11
|
+
import {} from "../user-input-pending.js";
|
|
12
|
+
import {} from "../vendor-hooks.js";
|
|
13
|
+
//# sourceMappingURL=support.js.map
|
|
@@ -0,0 +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,EAA+C,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAsD,MAAM,qBAAqB,CAAC;AAEzF,OAAO,EAAyB,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAuB,MAAM,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { type SessionNotification } from "../protocol.ts";
|
|
2
|
+
import type { createExecutorRuntime } from "./runtime.ts";
|
|
3
|
+
import type { AcpExecutorSupport, CompactionRecord } from "./support.ts";
|
|
4
|
+
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
|
+
emitCompactionState: (record: CompactionRecord, state: "compacting" | "compacted") => void;
|
|
6
|
+
handleSessionUpdate: (params: SessionNotification) => void;
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=updates.d.ts.map
|
|
@@ -0,0 +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;kCAKS,gBAAgB,SACjB,YAAY,GAAG,WAAW,KAChC,IAAI;kCAmG8B,mBAAmB,KAAG,IAAI;EAqJhE"}
|
|
@@ -0,0 +1,245 @@
|
|
|
1
|
+
// @effect-diagnostics nodeBuiltinImport:off
|
|
2
|
+
// @effect-diagnostics globalDate:off
|
|
3
|
+
// @effect-diagnostics globalTimers:off
|
|
4
|
+
import { resourceLinkArtifacts } from "../artifacts.js";
|
|
5
|
+
import { makeAcpContentDeltaEvent, makeAcpPlanUpdatedEvent, makeAcpToolCallEvent, retainToolCallUpdate, } from "../events.js";
|
|
6
|
+
import {} from "../protocol.js";
|
|
7
|
+
import { parseAvailableCommandsUpdate, parseSessionUpdateEvent } from "../runtime-model.js";
|
|
8
|
+
const COMPACTION_SUMMARY_MAX_CHARS = 8_000;
|
|
9
|
+
const SHOWN_TOOL_CALL_LIMIT = 256;
|
|
10
|
+
export function createExecutorUpdates({ emit, stamp, options, nowMs, compactions, randomId, toolCalls, hooks, emitArtifacts, closeActiveAssistantSegment, ensureActiveAssistantSegment, shared, }) {
|
|
11
|
+
/** 已经发过工具事件的调用 id,有界。晚到的更新靠它认出「不是新调用」。 */
|
|
12
|
+
const shownToolCallIds = new Set();
|
|
13
|
+
const emitCompactionState = (record, state) => {
|
|
14
|
+
const summary = record.summary?.trim() ?? "";
|
|
15
|
+
const truncated = summary.length > COMPACTION_SUMMARY_MAX_CHARS;
|
|
16
|
+
emit({
|
|
17
|
+
type: "thread.state.changed",
|
|
18
|
+
...stamp(),
|
|
19
|
+
provider: options.provider,
|
|
20
|
+
threadId: options.threadId,
|
|
21
|
+
...(shared.activeTurnId !== undefined ? { turnId: shared.activeTurnId } : {}),
|
|
22
|
+
payload: {
|
|
23
|
+
state,
|
|
24
|
+
compaction: {
|
|
25
|
+
compactionId: record.snapshotId,
|
|
26
|
+
trigger: record.trigger,
|
|
27
|
+
...(state === "compacted"
|
|
28
|
+
? { durationMs: Math.max(0, nowMs() - record.startedAtMs) }
|
|
29
|
+
: {}),
|
|
30
|
+
...(summary.length > 0
|
|
31
|
+
? {
|
|
32
|
+
summary: truncated ? summary.slice(0, COMPACTION_SUMMARY_MAX_CHARS) : summary,
|
|
33
|
+
...(truncated ? { summaryTruncated: true } : {}),
|
|
34
|
+
}
|
|
35
|
+
: {}),
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
};
|
|
40
|
+
const applyCompactionUpdate = (event) => {
|
|
41
|
+
let record = compactions.get(event.compactionId);
|
|
42
|
+
if (record === undefined) {
|
|
43
|
+
// 手动压缩进行中:agent 自报的第一条就是它,沿用我们的 id,投影才折成同一行。
|
|
44
|
+
if (shared.manualCompaction !== undefined && !shared.manualCompaction.adopted) {
|
|
45
|
+
shared.manualCompaction.adopted = true;
|
|
46
|
+
record = shared.manualCompaction;
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
record = {
|
|
50
|
+
snapshotId: randomId(),
|
|
51
|
+
trigger: "automatic",
|
|
52
|
+
startedAtMs: nowMs(),
|
|
53
|
+
summary: undefined,
|
|
54
|
+
announced: false,
|
|
55
|
+
finished: false,
|
|
56
|
+
adopted: false,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
compactions.set(event.compactionId, record);
|
|
60
|
+
}
|
|
61
|
+
if (event.summary !== undefined)
|
|
62
|
+
record.summary = event.summary ?? undefined;
|
|
63
|
+
switch (event.status) {
|
|
64
|
+
case "in_progress":
|
|
65
|
+
if (!record.announced) {
|
|
66
|
+
record.announced = true;
|
|
67
|
+
emitCompactionState(record, "compacting");
|
|
68
|
+
}
|
|
69
|
+
return;
|
|
70
|
+
case "completed":
|
|
71
|
+
record.announced = true;
|
|
72
|
+
record.finished = true;
|
|
73
|
+
compactions.delete(event.compactionId);
|
|
74
|
+
emitCompactionState(record, "compacted");
|
|
75
|
+
return;
|
|
76
|
+
case "failed":
|
|
77
|
+
case "cancelled":
|
|
78
|
+
record.finished = true;
|
|
79
|
+
compactions.delete(event.compactionId);
|
|
80
|
+
emit({
|
|
81
|
+
type: "runtime.warning",
|
|
82
|
+
...stamp(),
|
|
83
|
+
provider: options.provider,
|
|
84
|
+
threadId: options.threadId,
|
|
85
|
+
...(shared.activeTurnId !== undefined ? { turnId: shared.activeTurnId } : {}),
|
|
86
|
+
payload: {
|
|
87
|
+
message: event.error ?? `Context compaction ${event.status}`,
|
|
88
|
+
detail: { code: `context-compaction-${event.status}` },
|
|
89
|
+
},
|
|
90
|
+
});
|
|
91
|
+
return;
|
|
92
|
+
default:
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
const rememberShownToolCall = (toolCallId) => {
|
|
97
|
+
shownToolCallIds.add(toolCallId);
|
|
98
|
+
if (shownToolCallIds.size <= SHOWN_TOOL_CALL_LIMIT)
|
|
99
|
+
return;
|
|
100
|
+
// 先淘汰最老的、已经收尾的;还在跑的调用(长命的后台命令)留着,否则它下一次更新会被当成新调用,把当时正在写的回答劈开。
|
|
101
|
+
for (const id of shownToolCallIds) {
|
|
102
|
+
if (toolCalls.has(id))
|
|
103
|
+
continue;
|
|
104
|
+
shownToolCallIds.delete(id);
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
};
|
|
108
|
+
const handleSessionUpdate = (params) => {
|
|
109
|
+
const parsed = parseSessionUpdateEvent(params);
|
|
110
|
+
if (parsed.modeId && shared.modeState) {
|
|
111
|
+
shared.modeState = {
|
|
112
|
+
...shared.modeState,
|
|
113
|
+
currentModeId: parsed.modeId,
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
const commands = parseAvailableCommandsUpdate(params);
|
|
117
|
+
if (commands !== undefined) {
|
|
118
|
+
shared.availableCommands = commands;
|
|
119
|
+
options.onAvailableCommands?.(commands);
|
|
120
|
+
}
|
|
121
|
+
if (shared.sessionLoadInFlight) {
|
|
122
|
+
shared.droppedReplayUpdates += parsed.events.filter((event) => event._tag !== "ModeChanged").length;
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
for (const event of parsed.events) {
|
|
126
|
+
if (event._tag === "ToolCallUpdated") {
|
|
127
|
+
const { nextToolCall, decision } = retainToolCallUpdate(toolCalls, event.toolCall, {
|
|
128
|
+
turnId: shared.activeTurnId,
|
|
129
|
+
rawTitle: params.update.title,
|
|
130
|
+
nowMs,
|
|
131
|
+
});
|
|
132
|
+
// 后台任务(监视器、后台 shell)的生命周期只在工具结果里:不论这次更新发不发工具事件,都要过一遍,轮询通知常常只带 rawOutput。
|
|
133
|
+
const hookResult = hooks.onToolCallUpdated?.({
|
|
134
|
+
toolCallId: nextToolCall.toolCallId,
|
|
135
|
+
status: nextToolCall.status,
|
|
136
|
+
title: nextToolCall.title,
|
|
137
|
+
kind: nextToolCall.kind,
|
|
138
|
+
rawInput: nextToolCall.data["rawInput"],
|
|
139
|
+
rawOutput: nextToolCall.data["rawOutput"],
|
|
140
|
+
meta: params.update._meta,
|
|
141
|
+
turnId: shared.activeTurnId,
|
|
142
|
+
});
|
|
143
|
+
const taskEvents = hookResult === undefined ? [] : "events" in hookResult ? hookResult.events : hookResult;
|
|
144
|
+
const handledByHook = hookResult !== undefined && "events" in hookResult && hookResult.handled === true;
|
|
145
|
+
for (const taskEvent of taskEvents) {
|
|
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
|
+
}
|
|
155
|
+
if (nextToolCall.status === "completed" && hookResult && "artifacts" in hookResult)
|
|
156
|
+
emitArtifacts(hookResult.artifacts ?? [], nextToolCall.toolCallId);
|
|
157
|
+
if (handledByHook || !decision.emit) {
|
|
158
|
+
continue;
|
|
159
|
+
}
|
|
160
|
+
// 新工具调用是回答里的分界;已经露过面的调用再报进度(比如后台命令跑完)不是,不能把一段回答从中间劈开。
|
|
161
|
+
if (!shownToolCallIds.has(nextToolCall.toolCallId)) {
|
|
162
|
+
rememberShownToolCall(nextToolCall.toolCallId);
|
|
163
|
+
closeActiveAssistantSegment(shared.activeTurnId);
|
|
164
|
+
}
|
|
165
|
+
emit(makeAcpToolCallEvent({
|
|
166
|
+
stamp: stamp(),
|
|
167
|
+
provider: options.provider,
|
|
168
|
+
threadId: options.threadId,
|
|
169
|
+
turnId: shared.activeTurnId,
|
|
170
|
+
toolCall: nextToolCall,
|
|
171
|
+
rawPayload: event.rawPayload,
|
|
172
|
+
}));
|
|
173
|
+
continue;
|
|
174
|
+
}
|
|
175
|
+
if (event._tag === "AssistantContentBlock") {
|
|
176
|
+
emitArtifacts(resourceLinkArtifacts(event.content));
|
|
177
|
+
continue;
|
|
178
|
+
}
|
|
179
|
+
if (event._tag === "CompactionUpdated") {
|
|
180
|
+
applyCompactionUpdate(event);
|
|
181
|
+
continue;
|
|
182
|
+
}
|
|
183
|
+
if (event._tag === "CompactionSummaryChunk") {
|
|
184
|
+
const record = compactions.get(event.compactionId);
|
|
185
|
+
if (record !== undefined && !record.finished) {
|
|
186
|
+
record.summary = (record.summary ?? "") + event.text;
|
|
187
|
+
}
|
|
188
|
+
continue;
|
|
189
|
+
}
|
|
190
|
+
if (event._tag === "ContentDelta") {
|
|
191
|
+
// 手动压缩那条命令吐的文本不是回答,不进时间线(压缩结果走生命周期事件)。
|
|
192
|
+
if (shared.manualCompaction !== undefined) {
|
|
193
|
+
continue;
|
|
194
|
+
}
|
|
195
|
+
if (event.streamKind === "reasoning_text") {
|
|
196
|
+
// 思考不得开 assistant 段:item.started 会把思考段收口,字会进正式回答。
|
|
197
|
+
if (event.text.trim().length === 0) {
|
|
198
|
+
continue;
|
|
199
|
+
}
|
|
200
|
+
emit(makeAcpContentDeltaEvent({
|
|
201
|
+
stamp: stamp(),
|
|
202
|
+
provider: options.provider,
|
|
203
|
+
threadId: options.threadId,
|
|
204
|
+
turnId: shared.activeTurnId,
|
|
205
|
+
text: event.text,
|
|
206
|
+
streamKind: "reasoning_text",
|
|
207
|
+
rawPayload: event.rawPayload,
|
|
208
|
+
}));
|
|
209
|
+
continue;
|
|
210
|
+
}
|
|
211
|
+
if (event.text.trim().length === 0 && !shared.assistantSegment.activeItemId) {
|
|
212
|
+
continue;
|
|
213
|
+
}
|
|
214
|
+
const itemId = shared.sessionId
|
|
215
|
+
? ensureActiveAssistantSegment(shared.sessionId, shared.activeTurnId)
|
|
216
|
+
: undefined;
|
|
217
|
+
emit(makeAcpContentDeltaEvent({
|
|
218
|
+
stamp: stamp(),
|
|
219
|
+
provider: options.provider,
|
|
220
|
+
threadId: options.threadId,
|
|
221
|
+
turnId: shared.activeTurnId,
|
|
222
|
+
...(itemId ? { itemId } : {}),
|
|
223
|
+
text: event.text,
|
|
224
|
+
streamKind: "assistant_text",
|
|
225
|
+
rawPayload: event.rawPayload,
|
|
226
|
+
}));
|
|
227
|
+
continue;
|
|
228
|
+
}
|
|
229
|
+
if (event._tag === "PlanUpdated") {
|
|
230
|
+
emit(makeAcpPlanUpdatedEvent({
|
|
231
|
+
stamp: stamp(),
|
|
232
|
+
provider: options.provider,
|
|
233
|
+
threadId: options.threadId,
|
|
234
|
+
turnId: shared.activeTurnId,
|
|
235
|
+
payload: event.payload,
|
|
236
|
+
source: "acp.jsonrpc",
|
|
237
|
+
method: "session/update",
|
|
238
|
+
rawPayload: event.rawPayload,
|
|
239
|
+
}));
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
};
|
|
243
|
+
return { emitCompactionState, handleSessionUpdate };
|
|
244
|
+
}
|
|
245
|
+
//# sourceMappingURL=updates.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"updates.js","sourceRoot":"","sources":["../../src/executor/updates.ts"],"names":[],"mappings":"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"}
|
package/dist/executor.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type * as NodeStream from "node:stream";
|
|
2
|
-
import { type InitializeResponse } from "./protocol.ts";
|
|
3
2
|
import { AcpExecutorError } from "./errors.ts";
|
|
4
3
|
import { type AcpOpenToolCall } from "./openCommands.ts";
|
|
4
|
+
import { type InitializeResponse } from "./protocol.ts";
|
|
5
5
|
import { type AcpAvailableCommand, type AcpPermissionRequest } from "./runtime-model.ts";
|
|
6
6
|
import type { AcpApprovalDecision, AcpPromptInput, AcpSessionStartResult, AcpSessionStatus, AcpTurnResult, ExecutorEvent } from "./types.ts";
|
|
7
7
|
import { type AcpVendorHooks } from "./vendor-hooks.ts";
|
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,
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
|