ycodium-acp-executor 0.2.3130 → 0.2.3168

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.
Files changed (43) hide show
  1. package/README.md +3 -4
  2. package/dist/connection.d.ts +10 -2
  3. package/dist/connection.d.ts.map +1 -1
  4. package/dist/connection.js +11 -3
  5. package/dist/connection.js.map +1 -1
  6. package/dist/executor/lifecycle.d.ts +4 -1
  7. package/dist/executor/lifecycle.d.ts.map +1 -1
  8. package/dist/executor/lifecycle.js +37 -23
  9. package/dist/executor/lifecycle.js.map +1 -1
  10. package/dist/executor/prompt-results.d.ts +30 -0
  11. package/dist/executor/prompt-results.d.ts.map +1 -0
  12. package/dist/executor/prompt-results.js +96 -0
  13. package/dist/executor/prompt-results.js.map +1 -0
  14. package/dist/executor/prompt.d.ts +5 -2
  15. package/dist/executor/prompt.d.ts.map +1 -1
  16. package/dist/executor/prompt.js +76 -51
  17. package/dist/executor/prompt.js.map +1 -1
  18. package/dist/executor/runtime.d.ts.map +1 -1
  19. package/dist/executor/runtime.js +2 -3
  20. package/dist/executor/runtime.js.map +1 -1
  21. package/dist/executor/settlement.d.ts.map +1 -1
  22. package/dist/executor/settlement.js +6 -1
  23. package/dist/executor/settlement.js.map +1 -1
  24. package/dist/executor/support.d.ts +5 -1
  25. package/dist/executor/support.d.ts.map +1 -1
  26. package/dist/executor/support.js.map +1 -1
  27. package/dist/executor.d.ts +3 -1
  28. package/dist/executor.d.ts.map +1 -1
  29. package/dist/executor.js +12 -1
  30. package/dist/executor.js.map +1 -1
  31. package/dist/index.d.ts +2 -0
  32. package/dist/index.d.ts.map +1 -1
  33. package/dist/index.js +2 -0
  34. package/dist/index.js.map +1 -1
  35. package/dist/session-registry.d.ts +9 -0
  36. package/dist/session-registry.d.ts.map +1 -0
  37. package/dist/session-registry.js +26 -0
  38. package/dist/session-registry.js.map +1 -0
  39. package/dist/sessionProcess.d.ts +11 -0
  40. package/dist/sessionProcess.d.ts.map +1 -0
  41. package/dist/sessionProcess.js +24 -0
  42. package/dist/sessionProcess.js.map +1 -0
  43. package/package.json +1 -1
@@ -7,12 +7,13 @@ import { acpPromptFailureCategory, failureCategoryField, withFailureCategory, }
7
7
  import {} from "../protocol.js";
8
8
  import { selectPromptTurnId } from "../util.js";
9
9
  import {} from "../vendor-hooks.js";
10
- export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit, stamp, options, interruptedTurnIds, hooks, randomId, connection, rememberSettledPromptKey, failIfDisposed, requireStarted, threadMutex, promptMutex, applyRequestedModel, notifyPromptSettled, shared, }) {
10
+ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit, stamp, options, interruptedTurnIds, hooks, randomId, connection, rememberSettledPromptKey, failIfDisposed, requireStarted, threadMutex, promptMutex, applyRequestedModel, notifyPromptSettled, shared, promptResults, }) {
11
11
  /** 这一条 prompt 落定;返回整轮是否就此收口(发了 `turn.completed`)。 */
12
12
  const settleTurn = (input) => {
13
- if (!isLive(input.expectedGeneration)) {
13
+ if (!isLive(input.expectedGeneration) || input.record.finished) {
14
14
  return false;
15
15
  }
16
+ promptResults.complete(input.record);
16
17
  if (!acpPromptSettlementBelongsToContext({
17
18
  liveAcpSessionId: shared.sessionId ?? "",
18
19
  expectedAcpSessionId: input.expectedSessionId,
@@ -30,6 +31,7 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
30
31
  if (shared.status !== "disposed") {
31
32
  shared.status = "ready";
32
33
  }
34
+ const interrupted = promptResults.hasInterrupted(input.turnId);
33
35
  emit({
34
36
  type: "turn.completed",
35
37
  ...stamp(),
@@ -37,13 +39,14 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
37
39
  threadId: options.threadId,
38
40
  turnId: input.turnId,
39
41
  payload: {
40
- state: input.state,
41
- stopReason: input.stopReason,
42
+ state: interrupted ? "cancelled" : input.state,
43
+ stopReason: interrupted ? "cancelled" : input.stopReason,
42
44
  ...(input.errorMessage === undefined ? {} : { errorMessage: input.errorMessage }),
43
45
  ...(input.state === "failed" ? failureCategoryField(input.failureCategory) : {}),
44
46
  },
45
47
  });
46
48
  interruptedTurnIds.delete(input.turnId);
49
+ promptResults.forget(input.turnId);
47
50
  return true;
48
51
  };
49
52
  /**
@@ -51,7 +54,7 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
51
54
  * 调用方持有 `promptMutex`;轮次的开合与事件由调用方管。`onWritten` 在请求写进对端
52
55
  * stdin 之后调用(规则 13 的传输完成点);写失败就不调。
53
56
  */
54
- const sendPromptRpc = async (sessionId, promptParts, onWritten) => {
57
+ const sendPromptRpc = async (sessionId, promptParts, onWritten, record) => {
55
58
  const settlementHooks = hooks.promptSettlement;
56
59
  // 有提前收口钩子时给这一轮一个关联 id,通知才认得回来。
57
60
  const promptKey = settlementHooks === undefined ? undefined : randomId();
@@ -61,7 +64,7 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
61
64
  ...(settlementHooks !== undefined && promptKey !== undefined
62
65
  ? settlementHooks.requestFields(promptKey)
63
66
  : {}),
64
- });
67
+ }, record?.promptId);
65
68
  // 不 await 写入:提前收口的等待要在下面同步登记好,对端回得再快也认得回来。
66
69
  void pending.written.then(onWritten, () => undefined);
67
70
  const promptRpc = pending.response;
@@ -75,7 +78,18 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
75
78
  }
76
79
  else {
77
80
  const { promise: early, resolve: settleEarly } = Promise.withResolvers();
78
- shared.pendingSettlement = { promptKey, sessionId, settle: settleEarly };
81
+ shared.pendingSettlement = {
82
+ promptKey,
83
+ sessionId,
84
+ settle: settleEarly,
85
+ ...(record === undefined
86
+ ? {}
87
+ : {
88
+ onResponse: (response) => promptResults.receive(record.promptId, response),
89
+ onError: () => promptResults.reject(record.promptId),
90
+ hasResult: () => record.response !== undefined,
91
+ }),
92
+ };
79
93
  try {
80
94
  const outcome = await Promise.race([
81
95
  promptRpc.then((value) => {
@@ -101,9 +115,11 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
101
115
  const prompt = async (input) => {
102
116
  failIfDisposed();
103
117
  const started = requireStarted();
118
+ let record;
104
119
  const settle = (rest) => settleTurn({
105
120
  expectedGeneration: started.generation,
106
121
  expectedSessionId: started.sessionId,
122
+ record,
107
123
  ...rest,
108
124
  });
109
125
  let turnId;
@@ -114,6 +130,14 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
114
130
  failIfDisposed();
115
131
  turnId = selectPromptTurnId(input, shared.promptsInFlight > 0 ? shared.activeTurnId : undefined, randomId);
116
132
  shared.promptsInFlight += 1;
133
+ record = promptResults.add({
134
+ promptId: randomId(),
135
+ sessionId: started.sessionId,
136
+ generation: started.generation,
137
+ turnId,
138
+ }, () => {
139
+ finishPrompt();
140
+ });
117
141
  shared.activeTurnId = turnId;
118
142
  shared.status = "running";
119
143
  if (shared.promptsInFlight === 1) {
@@ -134,6 +158,47 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
134
158
  (input.text !== undefined
135
159
  ? [{ type: "text", text: input.text }]
136
160
  : [{ type: "text", text: "" }]);
161
+ let contextWindow;
162
+ const finishPrompt = () => {
163
+ if (!isLive(started.generation) || record.finished)
164
+ throw new AcpExecutorDisposedError();
165
+ const response = record.response;
166
+ if (record.interrupted || response === undefined) {
167
+ settle({ turnId, stopReason: "cancelled", state: "cancelled" });
168
+ return { threadId: options.threadId, turnId, stopReason: "cancelled" };
169
+ }
170
+ const stopReason = hooks.completedStopReason?.(response) ?? response.stopReason;
171
+ if (contextWindow !== undefined) {
172
+ emit({
173
+ type: "thread.token-usage.updated",
174
+ ...stamp(),
175
+ provider: options.provider,
176
+ threadId: options.threadId,
177
+ turnId,
178
+ payload: {
179
+ usage: {
180
+ usedTokens: contextWindow.usedTokens,
181
+ ...(contextWindow.maxTokens === undefined
182
+ ? {}
183
+ : { maxTokens: contextWindow.maxTokens }),
184
+ },
185
+ },
186
+ });
187
+ }
188
+ settle({
189
+ turnId,
190
+ stopReason,
191
+ state: response.stopReason === "cancelled" ? "cancelled" : "completed",
192
+ });
193
+ return {
194
+ threadId: options.threadId,
195
+ turnId,
196
+ stopReason,
197
+ ...(response.usage !== undefined && response.usage !== null
198
+ ? { usage: response.usage }
199
+ : {}),
200
+ };
201
+ };
137
202
  await promptMutex.acquire();
138
203
  let response;
139
204
  try {
@@ -150,6 +215,7 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
150
215
  expectedGeneration: started.generation,
151
216
  });
152
217
  }
218
+ failIfDisposed();
153
219
  if (isStale()) {
154
220
  settle({ turnId, stopReason: "cancelled", state: "cancelled" });
155
221
  return { threadId: options.threadId, turnId, stopReason: "cancelled" };
@@ -160,7 +226,7 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
160
226
  response = await sendPromptRpc(started.sessionId, promptParts, () => {
161
227
  written = true;
162
228
  input.onDispatched?.(turnId);
163
- });
229
+ }, record);
164
230
  }
165
231
  catch (error) {
166
232
  if (shared.disposed) {
@@ -206,9 +272,9 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
206
272
  if (turnId === undefined) {
207
273
  throw new AcpExecutorError("internal", "ACP prompt settled without a turn id");
208
274
  }
209
- const settledTurnId = turnId;
210
275
  // 上下文占用在这家 CLI 自己写的记录里(厂商钩子);读不到、读坏都不挡轮次收尾——少一条事件,界面不画圈,而不是画一个编出来的数。
211
- let contextWindow;
276
+ if (record.finished)
277
+ throw new AcpExecutorDisposedError();
212
278
  if (hooks.readContextWindow !== undefined) {
213
279
  try {
214
280
  contextWindow =
@@ -221,47 +287,6 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
221
287
  contextWindow = undefined;
222
288
  }
223
289
  }
224
- const finishPrompt = () => {
225
- if (interruptedTurnIds.has(settledTurnId)) {
226
- settle({ turnId: settledTurnId, stopReason: "cancelled", state: "cancelled" });
227
- return {
228
- threadId: options.threadId,
229
- turnId: settledTurnId,
230
- stopReason: "cancelled",
231
- };
232
- }
233
- const stopReason = hooks.completedStopReason?.(response) ?? response.stopReason;
234
- if (contextWindow !== undefined) {
235
- emit({
236
- type: "thread.token-usage.updated",
237
- ...stamp(),
238
- provider: options.provider,
239
- threadId: options.threadId,
240
- turnId: settledTurnId,
241
- payload: {
242
- usage: {
243
- usedTokens: contextWindow.usedTokens,
244
- ...(contextWindow.maxTokens === undefined
245
- ? {}
246
- : { maxTokens: contextWindow.maxTokens }),
247
- },
248
- },
249
- });
250
- }
251
- settle({
252
- turnId: settledTurnId,
253
- stopReason,
254
- state: response.stopReason === "cancelled" ? "cancelled" : "completed",
255
- });
256
- return {
257
- threadId: options.threadId,
258
- turnId: settledTurnId,
259
- stopReason,
260
- ...(response.usage !== undefined && response.usage !== null
261
- ? { usage: response.usage }
262
- : {}),
263
- };
264
- };
265
290
  if (threadMutex.tryAcquire()) {
266
291
  try {
267
292
  return finishPrompt();
@@ -1 +1 @@
1
- {"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/executor/prompt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/executor/prompt.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/executor/runtime.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,qBAAqB,CAAC,EACpC,QAAQ,EACR,MAAM,EACN,WAAW,EACX,OAAO,EACP,sBAAsB,EACtB,WAAW,EACX,MAAM,GACP,EAAE,IAAI,CACL,kBAAkB,EAChB,UAAU,GACV,QAAQ,GACR,aAAa,GACb,SAAS,GACT,wBAAwB,GACxB,aAAa,GACb,QAAQ,CACX;iBACmB,aAAa;iCAOK,MAAM,KAAG,OAAO;kBAchC,aAAa,KAAK,IAAI;;0BASf,IAAI;0CAMc,MAAM,GAAG,SAAS,KAAG,IAAI;iDAmBtD,MAAM,UACZ,MAAM,GAAG,SAAS,KACzB,MAAM;+BAsBuB,IAAI;mCAOQ,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;EA4BtE"}
1
+ {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/executor/runtime.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,qBAAqB,CAAC,EACpC,QAAQ,EACR,MAAM,EACN,WAAW,EACX,OAAO,EACP,sBAAsB,EACtB,WAAW,EACX,MAAM,GACP,EAAE,IAAI,CACL,kBAAkB,EAChB,UAAU,GACV,QAAQ,GACR,aAAa,GACb,SAAS,GACT,wBAAwB,GACxB,aAAa,GACb,QAAQ,CACX;iBACmB,aAAa;iCAMK,MAAM,KAAG,OAAO;kBAchC,aAAa,KAAK,IAAI;;0BASf,IAAI;0CAMc,MAAM,GAAG,SAAS,KAAG,IAAI;iDAmBtD,MAAM,UACZ,MAAM,GAAG,SAAS,KACzB,MAAM;+BAsBuB,IAAI;mCAOQ,MAAM,KAAG,OAAO,CAAC,OAAO,CAAC;EA4BtE"}
@@ -9,8 +9,7 @@ export function createExecutorRuntime({ randomId, nowIso, eventStream, options,
9
9
  eventId: randomId(),
10
10
  createdAt: nowIso(),
11
11
  });
12
- // 迟到的结果先验身份:dispose 之后、或已经换代的那次 start/prompt 完成时,
13
- // 不许回写状态。`Promise.race` 输掉的那一方还在跑,这是唯一的拦截点。
12
+ // 代次失效后不许回写状态;正在关闭时,已登记结果的收尾仍属于当前代次。
14
13
  const isLive = (expectedGeneration) => !shared.disposed && shared.generation === expectedGeneration;
15
14
  const publish = (event) => {
16
15
  if (shared.disposed) {
@@ -28,7 +27,7 @@ export function createExecutorRuntime({ randomId, nowIso, eventStream, options,
28
27
  turnId: () => shared.activeTurnId,
29
28
  });
30
29
  const failIfDisposed = () => {
31
- if (shared.disposed) {
30
+ if (shared.disposed || shared.disposing) {
32
31
  throw new AcpExecutorDisposedError();
33
32
  }
34
33
  };
@@ -1 +1 @@
1
- {"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/executor/runtime.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/executor/runtime.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"settlement.d.ts","sourceRoot":"","sources":["../../src/executor/settlement.ts"],"names":[],"mappings":"AAIA,OAAO,EAAuB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAIvD,wBAAgB,wBAAwB,CAAC,EACvC,KAAK,EACL,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,CAAC;oCAON,MAAM,KAAG,IAAI;qCAOZ,MAAM,oBAAoB,kBAAkB,KAAG,IAAI;qCAsBnD,MAAM,UAAU,OAAO,KAAG,OAAO;EAkC1E"}
1
+ {"version":3,"file":"settlement.d.ts","sourceRoot":"","sources":["../../src/executor/settlement.ts"],"names":[],"mappings":"AAIA,OAAO,EAAuB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAKvD,wBAAgB,wBAAwB,CAAC,EACvC,KAAK,EACL,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,CAAC;oCAON,MAAM,KAAG,IAAI;qCAOZ,MAAM,oBAAoB,kBAAkB,KAAG,IAAI;qCAuBnD,MAAM,UAAU,OAAO,KAAG,OAAO;EAqC1E"}
@@ -22,6 +22,8 @@ export function createExecutorSettlement({ hooks, shared, }) {
22
22
  const waiting = shared.pendingSettlement;
23
23
  if (waiting === undefined)
24
24
  return;
25
+ if (waiting.hasResult?.())
26
+ return;
25
27
  shared.pendingSettlement = undefined;
26
28
  waiting.settle({
27
29
  error: withFailureCategory(new AcpExecutorRequestError("session/prompt", reason), failureCategory),
@@ -54,13 +56,16 @@ export function createExecutorSettlement({ hooks, shared, }) {
54
56
  shared.pendingSettlement = undefined;
55
57
  rememberSettledPromptKey(waiting.promptKey);
56
58
  if (signal.outcome === "error") {
59
+ waiting.onError?.();
57
60
  waiting.settle({
58
61
  error: withFailureCategory(new AcpExecutorRequestError("session/prompt", signal.detail ?? "prompt failed without an error detail"), signal.failureCategory),
59
62
  });
60
63
  }
61
64
  else {
65
+ const response = { stopReason: signal.stopReason ?? "end_turn" };
66
+ waiting.onResponse?.(response);
62
67
  waiting.settle({
63
- response: { stopReason: signal.stopReason ?? "end_turn" },
68
+ response,
64
69
  });
65
70
  }
66
71
  return true;
@@ -1 +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"}
1
+ {"version":3,"file":"settlement.js","sourceRoot":"","sources":["../../src/executor/settlement.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ import { type AcpToolCallTrackedState } from "../events.ts";
4
4
  import type { AcpExecutorOptions } from "../executor.ts";
5
5
  import { type AcpModelSelectionState } from "../model-selection.ts";
6
6
  import { Mutex } from "../mutex.ts";
7
- import { type AcpConnection, type InitializeResponse } from "../protocol.ts";
7
+ import { type AcpConnection, type InitializeResponse, type PromptResponse } from "../protocol.ts";
8
8
  import { type AcpAvailableCommand, type AcpSessionModeState } from "../runtime-model.ts";
9
9
  import type { AcpSessionStartResult, AcpSessionStatus } from "../types.ts";
10
10
  import { type PendingUserInput } from "../user-input-pending.ts";
@@ -28,6 +28,7 @@ export type CompactionRecord = {
28
28
  export type AcpExecutorState = {
29
29
  generation: number;
30
30
  disposed: boolean;
31
+ disposing: boolean;
31
32
  status: AcpSessionStatus;
32
33
  sessionId: string | undefined;
33
34
  modelSelectionState: AcpModelSelectionState;
@@ -42,6 +43,9 @@ export type AcpExecutorState = {
42
43
  pendingSettlement: {
43
44
  readonly promptKey: string;
44
45
  readonly sessionId: string;
46
+ readonly onResponse?: (response: PromptResponse) => void;
47
+ readonly onError?: () => void;
48
+ readonly hasResult?: () => boolean;
45
49
  readonly settle: (outcome: {
46
50
  readonly error?: Error;
47
51
  readonly response?: unknown;
@@ -1 +1 @@
1
- {"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../src/executor/support.ts"],"names":[],"mappings":"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"}
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,EAA+C,MAAM,gBAAgB,CAAC;AAC7E,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"}
@@ -67,13 +67,15 @@ export type AcpExecutorOptions = {
67
67
  readonly warn?: (message: string, fields?: Readonly<Record<string, unknown>>) => void;
68
68
  };
69
69
  readonly cancelGraceMs?: number;
70
+ /** 已收到结果的收尾等待上限;不罩进程或连接清理。 */
71
+ readonly resultDrainTimeoutMs?: number;
70
72
  readonly nowMs?: () => number;
71
73
  readonly nowIso?: () => string;
72
74
  readonly randomId?: () => string;
73
75
  readonly originBindingGeneration?: number;
74
76
  /**
75
77
  * 测试缝:每次 RPC 成功之后、把结果写进会话状态之前调用。
76
- * 用来构造「dispose 之后迟到的成功结果」。
78
+ * 用来构造「结果已收到,收尾尚未发布」与迟到续体。
77
79
  */
78
80
  readonly beforeApplyResult?: () => Promise<void>;
79
81
  };
@@ -1 +1 @@
1
- {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
package/dist/executor.js CHANGED
@@ -8,6 +8,7 @@ import { UnboundedEventStream } from "./event-stream.js";
8
8
  import {} from "./events.js";
9
9
  import { createExecutorLifecycle } from "./executor/lifecycle.js";
10
10
  import { createExecutorPrompt } from "./executor/prompt.js";
11
+ import { createPromptResults } from "./executor/prompt-results.js";
11
12
  import { createExecutorRequests } from "./executor/requests.js";
12
13
  import { createExecutorRuntime } from "./executor/runtime.js";
13
14
  import { createExecutorSession } from "./executor/session.js";
@@ -38,6 +39,7 @@ export function createAcpExecutor(options) {
38
39
  const shared = {
39
40
  generation: 0,
40
41
  disposed: false,
42
+ disposing: false,
41
43
  status: "idle",
42
44
  sessionId: undefined,
43
45
  modelSelectionState: {
@@ -110,6 +112,7 @@ export function createAcpExecutor(options) {
110
112
  shared,
111
113
  });
112
114
  const { rememberSettledPromptKey, abortPendingSettlement, settleFromNotification } = createExecutorSettlement({ hooks, shared });
115
+ const promptResults = createPromptResults({ options, shared });
113
116
  const connection = createAcpConnection({
114
117
  readable: options.readable,
115
118
  writable: options.writable,
@@ -120,9 +123,15 @@ export function createAcpExecutor(options) {
120
123
  });
121
124
  },
122
125
  // 窗口在应答帧到达的那一刻同步收掉:应答之后的通知是真输出,不能再丢。
123
- onResponse: (method) => {
126
+ onResponse: ({ method, promptId }, outcome) => {
124
127
  if (method === "session/load")
125
128
  shared.sessionLoadInFlight = false;
129
+ if (promptId !== undefined) {
130
+ if ("result" in outcome)
131
+ promptResults.receive(promptId, outcome.result);
132
+ else
133
+ promptResults.reject(promptId);
134
+ }
126
135
  },
127
136
  onNotification: (notification) => {
128
137
  if (notification.method === "session/update") {
@@ -190,6 +199,7 @@ export function createAcpExecutor(options) {
190
199
  shared,
191
200
  });
192
201
  const { sendPromptRpc, prompt } = createExecutorPrompt({
202
+ promptResults,
193
203
  isLive,
194
204
  closeActiveAssistantSegment,
195
205
  emit,
@@ -209,6 +219,7 @@ export function createAcpExecutor(options) {
209
219
  shared,
210
220
  });
211
221
  const { cancel, compact, dispose } = createExecutorLifecycle({
222
+ promptResults,
212
223
  failIfDisposed,
213
224
  requireStarted,
214
225
  interruptedTurnIds,
@@ -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,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,EACL,cAAc,EACd,YAAY,EACZ,mBAAmB,GAKpB,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;AAsGtC,SAAS,aAAa;IACpB,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,eAAe;IACtB,OAAO,UAAU,CAAC,UAAU,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAA2B;IAC3D,MAAM,KAAK,GAAG,EAAE,GAAG,kBAAkB,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAE1D,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,uBAAuB,CAAC;IAEvE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,aAAa,CAAC;IAE/C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC;IAErD,MAAM,WAAW,GAAG,IAAI,oBAAoB,EAAE,CAAC;IAE/C,MAAM,WAAW,GAAG,IAAI,KAAK,EAAE,CAAC;IAEhC,MAAM,WAAW,GAAG,IAAI,KAAK,EAAE,CAAC;IAChC,MAAM,MAAM,GAAqB;QAC/B,UAAU,EAAE,CAAC;QACb,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,SAAS;QACpB,mBAAmB,EAAE;YACnB,QAAQ,EAAE,mBAAmB;YAC7B,uBAAuB,EAAE,KAAK;YAC9B,aAAa,EAAE,SAAS;YACxB,cAAc,EAAE,SAAS;YACzB,qBAAqB,EAAE,EAAE;SAC1B;QACD,oBAAoB,EAAE,SAAS;QAC/B,gBAAgB,EAAE,SAAS;QAC3B,WAAW,EAAE,SAAS;QACtB,aAAa,EAAE,SAAS;QACxB,YAAY,EAAE,SAAS;QACvB,eAAe,EAAE,CAAC;QAClB,iBAAiB,EAAE,SAAS;QAC5B,gBAAgB,EAAE,SAAS;QAC3B,gBAAgB,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE;QACzC,SAAS,EAAE,SAAS;QACpB,iBAAiB,EAAE,EAAE;QACrB,aAAa,EAAE,EAAE;QACjB,gBAAgB,EAAE,SAAS;QAC3B,gBAAgB,EAAE,KAAK;QACvB,mBAAmB,EAAE,KAAK;QAC1B,oBAAoB,EAAE,CAAC;KACxB,CAAC;IAEF,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE7C,MAAM,SAAS,GAAG,kBAAkB,CAAC;QACnC,cAAc,EAAE,KAAK;KACtB,CAAC,CAAC;IAEH,+EAA+E;IAC/E,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA4B,CAAC;IAE9D,MAAM,SAAS,GAAG,IAAI,GAAG,EAAmC,CAAC;IAE7D,2DAA2D;IAC3D,MAAM,WAAW,GAAG,IAAI,GAAG,EAA4B,CAAC;IAExD,MAAM,KAAK,GAAG,GAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;IAE5D,MAAM,sBAAsB,GAAG,QAAQ,EAAE,CAAC;IAC1C,MAAM,EACJ,KAAK,EACL,MAAM,EACN,IAAI,EACJ,aAAa,EACb,cAAc,EACd,2BAA2B,EAC3B,4BAA4B,EAC5B,mBAAmB,EACnB,iBAAiB,GAClB,GAAG,qBAAqB,CAAC;QACxB,QAAQ;QACR,MAAM;QACN,WAAW;QACX,OAAO;QACP,sBAAsB;QACtB,WAAW;QACX,MAAM;KACP,CAAC,CAAC;IACH,MAAM,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,GAAG,qBAAqB,CAAC;QACzE,IAAI;QACJ,KAAK;QACL,OAAO;QACP,KAAK;QACL,WAAW;QACX,QAAQ;QACR,SAAS;QACT,KAAK;QACL,aAAa;QACb,2BAA2B;QAC3B,4BAA4B;QAC5B,MAAM;KACP,CAAC,CAAC;IACH,MAAM,EACJ,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,uBAAuB,EACvB,gBAAgB,EAChB,kBAAkB,GACnB,GAAG,sBAAsB,CAAC;QACzB,IAAI;QACJ,KAAK;QACL,OAAO;QACP,SAAS;QACT,iBAAiB;QACjB,cAAc;QACd,QAAQ;QACR,KAAK;QACL,MAAM;KACP,CAAC,CAAC;IACH,MAAM,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,GAChF,wBAAwB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9C,MAAM,UAAU,GAAkB,mBAAmB,CAAC;QACpD,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1B,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,iEAAiE,EAAE;gBACrF,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC9D,CAAC,CAAC;QACL,CAAC;QACD,qCAAqC;QACrC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;YACrB,IAAI,MAAM,KAAK,cAAc;gBAAE,MAAM,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACpE,CAAC;QACD,cAAc,EAAE,CAAC,YAAqC,EAAE,EAAE;YACxD,IAAI,YAAY,CAAC,MAAM,KAAK,gBAAgB,EAAE,CAAC;gBAC7C,MAAM,MAAM,GAAG,YAAY,CAAC,MAA6B,CAAC;gBAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,sBAAsB;oBAC9C,CAAC,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,CAAC;oBACtC,CAAC,CAAC,MAAM,CAAC;gBACX,IAAI,WAAW,KAAK,SAAS;oBAAE,mBAAmB,CAAC,WAAW,CAAC,CAAC;gBAChE,OAAO;YACT,CAAC;YACD,IAAI,sBAAsB,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC;gBAAE,OAAO;YAC7E,KAAK,KAAK,CAAC,uBAAuB,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;QACjF,CAAC;QACD,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAClC,IAAI,MAAM,KAAK,cAAc,CAAC,0BAA0B,EAAE,CAAC;gBACzD,OAAO,uBAAuB,CAAC,MAAM,CAAC,CAAC;YACzC,CAAC;YACD,IAAI,KAAK,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,6CAA6C;gBAC7C,qCAAqC;gBACrC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAC5C,MAAM,EACN,MAAM,EACN,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CACrC,CAAC;gBACF,IAAI,OAAO,KAAK,SAAS;oBAAE,OAAO,OAAO,CAAC;YAC5C,CAAC;YACD,MAAM,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC,CAAC;IAEH,KAAK,UAAU,CAAC,MAAM,CAAC,IAAI,CACzB,GAAG,EAAE;QACH,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC/B,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC7B,mBAAmB,EAAE,CAAC;QACtB,sBAAsB,CACpB,mBAAmB,EACnB,yBAAyB,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,CAC7E,CAAC;QACF,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC,EACD,GAAG,EAAE;QACH,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC;IACjC,CAAC,CACF,CAAC;IAEF,kDAAkD;IAClD,mDAAmD;IACnD,yCAAyC;IACzC,MAAM,WAAW,GAAG,GAAS,EAAE;QAC7B,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC7B,mBAAmB,EAAE,CAAC;QACtB,0CAA0C;QAC1C,4DAA4D;QAC5D,6CAA6C;QAC7C,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC;IAEF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC5C,MAAM,EAAE,mBAAmB,EAAE,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,qBAAqB,CAAC;QAC1F,OAAO;QACP,UAAU;QACV,MAAM;QACN,IAAI;QACJ,KAAK;QACL,cAAc;QACd,MAAM;KACP,CAAC,CAAC;IACH,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC;QACrD,MAAM;QACN,2BAA2B;QAC3B,IAAI;QACJ,KAAK;QACL,OAAO;QACP,kBAAkB;QAClB,KAAK;QACL,QAAQ;QACR,UAAU;QACV,wBAAwB;QACxB,cAAc;QACd,cAAc;QACd,WAAW;QACX,WAAW;QACX,mBAAmB;QACnB,mBAAmB;QACnB,MAAM;KACP,CAAC,CAAC;IACH,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,uBAAuB,CAAC;QAC3D,cAAc;QACd,cAAc;QACd,kBAAkB;QAClB,kBAAkB;QAClB,mBAAmB;QACnB,sBAAsB;QACtB,UAAU;QACV,iBAAiB;QACjB,aAAa;QACb,MAAM;QACN,2BAA2B;QAC3B,IAAI;QACJ,KAAK;QACL,OAAO;QACP,WAAW;QACX,QAAQ;QACR,KAAK;QACL,mBAAmB;QACnB,aAAa;QACb,WAAW;QACX,mBAAmB;QACnB,WAAW;QACX,WAAW;QACX,MAAM;KACP,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,UAAU;YACZ,OAAO,MAAM,CAAC,UAAU,CAAC;QAC3B,CAAC;QACD,IAAI,SAAS;YACX,OAAO,MAAM,CAAC,SAAS,CAAC;QAC1B,CAAC;QACD,IAAI,OAAO;YACT,OAAO,MAAM,CAAC,mBAAmB,CAAC,cAAc,CAAC;QACnD,CAAC;QACD,IAAI,MAAM;YACR,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC;QACD,MAAM,EAAE,WAAW,CAAC,SAAS,EAAE;QAC/B,KAAK;QACL,MAAM;QACN,MAAM;QACN,gBAAgB;QAChB,kBAAkB;QAClB,aAAa;QACb,OAAO;QACP,aAAa,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC;QACtE,OAAO;KACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,OAAO,KAAK,YAAY,gBAAgB,CAAC;AAC3C,CAAC"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,7 +1,9 @@
1
1
  export { createAcpExecutor } from "./executor.ts";
2
+ export { createAcpSessionRegistry } from "./session-registry.ts";
2
3
  export type { AcpFailureCategory } from "./failureCategory.ts";
3
4
  export type { AcpExecutor, AcpExecutorOptions } from "./executor.ts";
4
5
  export type { AcpOpenToolCall } from "./openCommands.ts";
6
+ export { acpNativeSessionProcessMatcher } from "./sessionProcess.ts";
5
7
  export { dispatchAcpPrompt } from "./prompt-dispatch.ts";
6
8
  export { raceStartAbort, throwIfStartAborted } from "./start-abort.ts";
7
9
  export type { AcpDispatchedPrompt } from "./prompt-dispatch.ts";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -1,4 +1,6 @@
1
1
  export { createAcpExecutor } from "./executor.js";
2
+ export { createAcpSessionRegistry } from "./session-registry.js";
3
+ export { acpNativeSessionProcessMatcher } from "./sessionProcess.js";
2
4
  export { dispatchAcpPrompt } from "./prompt-dispatch.js";
3
5
  export { raceStartAbort, throwIfStartAborted } from "./start-abort.js";
4
6
  export { toAcpMcpServers } from "./mcp-servers.js";
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAIlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAMtD,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EAChC,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzF,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,wBAAwB,EACxB,6BAA6B,EAC7B,wBAAwB,EACxB,gBAAgB,EAChB,0BAA0B,EAC1B,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,mCAAmC,EACnC,oBAAoB,EACpB,2BAA2B,EAC3B,qCAAqC,GACtC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,4BAA4B,EAC5B,yBAAyB,EACzB,wBAAwB,EACxB,uBAAuB,EACvB,yBAAyB,EACzB,2BAA2B,EAC3B,oBAAoB,GACrB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,oBAAoB,EACpB,mCAAmC,EACnC,yBAAyB,EACzB,kBAAkB,EAClB,4BAA4B,EAC5B,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,EACrB,0CAA0C,GAC3C,MAAM,oBAAoB,CAAC;AAU5B,OAAO,EACL,8BAA8B,EAC9B,oBAAoB,EACpB,eAAe,EACf,YAAY,EACZ,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AAsBzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,iCAAiC;AACjC,OAAO,EACL,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,EACnB,mBAAmB,EACnB,uBAAuB,EACvB,OAAO,EACP,YAAY,GACb,MAAM,eAAe,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAIjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAMtD,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EAChC,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzF,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,wBAAwB,EACxB,6BAA6B,EAC7B,wBAAwB,EACxB,gBAAgB,EAChB,0BAA0B,EAC1B,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,mCAAmC,EACnC,oBAAoB,EACpB,2BAA2B,EAC3B,qCAAqC,GACtC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,4BAA4B,EAC5B,yBAAyB,EACzB,wBAAwB,EACxB,uBAAuB,EACvB,yBAAyB,EACzB,2BAA2B,EAC3B,oBAAoB,GACrB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,oBAAoB,EACpB,mCAAmC,EACnC,yBAAyB,EACzB,kBAAkB,EAClB,4BAA4B,EAC5B,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,EACrB,0CAA0C,GAC3C,MAAM,oBAAoB,CAAC;AAU5B,OAAO,EACL,8BAA8B,EAC9B,oBAAoB,EACpB,eAAe,EACf,YAAY,EACZ,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AAsBzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,iCAAiC;AACjC,OAAO,EACL,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,EACnB,mBAAmB,EACnB,uBAAuB,EACvB,OAAO,EACP,YAAY,GACb,MAAM,eAAe,CAAC"}
@@ -0,0 +1,9 @@
1
+ /** 关闭期间保留归属;所有关闭入口必须复用同一任务,成功后才能删记录。 */
2
+ export declare function createAcpSessionRegistry<T extends {
3
+ closing?: Promise<void>;
4
+ }>(threads: Map<string, T>, stopBooked: (booked: T) => Promise<void>): {
5
+ requireThread: (threadId: string) => T;
6
+ stopSession: (threadId: string, booked?: T | undefined) => Promise<void>;
7
+ stopAll: () => Promise<void>;
8
+ };
9
+ //# sourceMappingURL=session-registry.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"session-registry.d.ts","sourceRoot":"","sources":["../src/session-registry.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,wBAAgB,wBAAwB,CAAC,CAAC,SAAS;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,EAC5E,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EACvB,UAAU,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;8BAEP,MAAM,KAAG,CAAC;4BAOZ,MAAM,6BAAmC,OAAO,CAAC,IAAI,CAAC;mBAWjE,OAAO,CAAC,IAAI,CAAC;EAMlC"}