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
package/README.md CHANGED
@@ -6,8 +6,7 @@ gives you a session that emits Ycodium executor events: assistant text, tool cal
6
6
  approvals, structured questions, token usage.
7
7
 
8
8
  If the CLI you want to add to Ycodium speaks ACP, you should not have to write framing,
9
- handshakes, permission round trips or cancellation yourself. This package is that layer. It has
10
- no dependency on Ycodium or on Effect.
9
+ handshakes, permission round trips or cancellation yourself. This package is that layer.
11
10
 
12
11
  ## Install
13
12
 
@@ -31,8 +30,8 @@ await esbuild.build({
31
30
  });
32
31
  ```
33
32
 
34
- It is an ES module for Node. The package depends on `@agentclientprotocol/sdk` and
35
- `zod` and re-exports the SDK types you need, so you do not have to install the SDK separately.
33
+ It is an ES module for Node. The package depends on `@agentclientprotocol/sdk` and `zod`.
34
+ It re-exports the SDK types you need, so you do not have to install the SDK separately.
36
35
 
37
36
  ## Build an ACP agent plugin
38
37
 
@@ -13,6 +13,10 @@ export type AcpIncomingNotification = {
13
13
  readonly method: string;
14
14
  readonly params: unknown;
15
15
  };
16
+ type AcpRequest = {
17
+ readonly method: string;
18
+ readonly promptId?: string;
19
+ };
16
20
  export type AcpConnectionOptions = {
17
21
  readonly readable: NodeStream.Readable;
18
22
  readonly writable: NodeStream.Writable;
@@ -22,7 +26,11 @@ export type AcpConnectionOptions = {
22
26
  * 对端的应答(成功或错误)落定的那一刻、按到达顺序同步调一次,先于任何排在它后面的帧。
23
27
  * 靠请求方 await 之后再标记「应答已到」不行:紧跟其后的通知可能先于那段续体被派发。
24
28
  */
25
- readonly onResponse?: (method: string) => void;
29
+ readonly onResponse?: (request: AcpRequest, outcome: {
30
+ readonly result: unknown;
31
+ } | {
32
+ readonly error: unknown;
33
+ }) => void;
26
34
  readonly logger?: (event: AcpProtocolLogEvent) => void;
27
35
  /** 入站任务(分发请求、写应答)失败、连接随即收掉时调;连接已经在收尾时不调。 */
28
36
  readonly onInboundFailure?: (error: unknown) => void;
@@ -38,7 +46,7 @@ export type AcpConnection = {
38
46
  * 同 `request`,但把两个时刻分开交出:`written` 在这条请求写进对端 stdin 后落定(写失败或
39
47
  * 连接先关就 reject),`response` 等对端应答。连接已关时同步抛错。
40
48
  */
41
- begin<T = unknown>(method: string, params?: unknown): AcpPendingRequest<T>;
49
+ begin<T = unknown>(method: string, params?: unknown, promptId?: string): AcpPendingRequest<T>;
42
50
  notify(method: string, params?: unknown): Promise<void>;
43
51
  awaitInboundIdle(): Promise<void>;
44
52
  close(error?: unknown): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAC/B,KAAK,6BAA6B,EAGlC,KAAK,mBAAmB,EACzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAY1C,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,SAAS,EAAE,UAAU,GAAG,UAAU,CAAC;IAC5C,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,eAAe,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAC/B;IACE,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,KAAK,CAAC;CACtC,GACD;IACE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEN,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC;IACvC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,YAAY,EAAE,uBAAuB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1F,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrF;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACvD,4CAA4C;IAC5C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACtD,CAAC;AAuCF,KAAK,iBAAiB,CAAC,CAAC,IAAI;IAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,CAAC,MAAM,SAAS,kBAAkB,EACvC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,0BAA0B,CAAC,MAAM,CAAC,GACzC,OAAO,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACnE;;;OAGG;IACH,KAAK,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAC3E,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,KAAK,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CAgYhF"}
1
+ {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
@@ -188,7 +188,9 @@ export function createAcpConnection(options) {
188
188
  }
189
189
  pending.delete(key);
190
190
  try {
191
- options.onResponse?.(waiter.method);
191
+ options.onResponse?.(waiter, Object.hasOwn(message, "error")
192
+ ? { error: message["error"] }
193
+ : { result: message["result"] });
192
194
  }
193
195
  catch {
194
196
  // 观察钩子出错不许挡住应答。
@@ -330,12 +332,18 @@ export function createAcpConnection(options) {
330
332
  options.readable.on("end", onEnd);
331
333
  options.readable.on("error", onError);
332
334
  options.writable.once("error", onWritableError);
333
- const begin = (method, params) => {
335
+ const begin = (method, params, promptId) => {
334
336
  failIfClosed();
335
337
  const id = nextRequestId;
336
338
  nextRequestId += 1;
337
339
  const { promise, resolve, reject } = Promise.withResolvers();
338
- pending.set(String(id), { method, resolve, reject });
340
+ // 提前收口后 RPC 可能永不应答;只能留标量关联号,不能留住正文、结果记录或其 finish 闭包。
341
+ pending.set(String(id), {
342
+ method,
343
+ ...(promptId === undefined ? {} : { promptId }),
344
+ resolve,
345
+ reject,
346
+ });
339
347
  const message = params === undefined
340
348
  ? { jsonrpc: "2.0", id, method }
341
349
  : { jsonrpc: "2.0", id, method, params };
@@ -1 +1 @@
1
- {"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,14 @@
1
1
  import type { createExecutorPrompt } from "./prompt.ts";
2
+ import type { createPromptResults } from "./prompt-results.ts";
2
3
  import type { createExecutorRequests } from "./requests.ts";
3
4
  import type { createExecutorRuntime } from "./runtime.ts";
4
5
  import type { createExecutorSession } from "./session.ts";
5
6
  import type { createExecutorSettlement } from "./settlement.ts";
6
7
  import type { AcpExecutorSupport } from "./support.ts";
7
8
  import type { createExecutorUpdates } from "./updates.ts";
8
- export declare function createExecutorLifecycle({ failIfDisposed, requireStarted, interruptedTurnIds, settleAllApprovals, settleAllUserInputs, abortPendingSettlement, connection, waitForPromptIdle, cancelGraceMs, isLive, closeActiveAssistantSegment, emit, stamp, options, promptMutex, randomId, nowMs, emitCompactionState, sendPromptRpc, compactions, notifyPromptSettled, eventStream, onInputDead, shared, }: Pick<AcpExecutorSupport, "interruptedTurnIds" | "connection" | "cancelGraceMs" | "options" | "promptMutex" | "randomId" | "nowMs" | "compactions" | "eventStream" | "onInputDead" | "shared"> & Pick<ReturnType<typeof createExecutorRuntime>, "failIfDisposed" | "waitForPromptIdle" | "isLive" | "closeActiveAssistantSegment" | "emit" | "stamp" | "notifyPromptSettled"> & Pick<ReturnType<typeof createExecutorUpdates>, "emitCompactionState"> & Pick<ReturnType<typeof createExecutorRequests>, "settleAllApprovals" | "settleAllUserInputs"> & Pick<ReturnType<typeof createExecutorSettlement>, "abortPendingSettlement"> & Pick<ReturnType<typeof createExecutorSession>, "requireStarted"> & Pick<ReturnType<typeof createExecutorPrompt>, "sendPromptRpc">): {
9
+ export declare function createExecutorLifecycle({ failIfDisposed, requireStarted, interruptedTurnIds, settleAllApprovals, settleAllUserInputs, abortPendingSettlement, connection, waitForPromptIdle, cancelGraceMs, isLive, closeActiveAssistantSegment, emit, stamp, options, promptMutex, randomId, nowMs, emitCompactionState, sendPromptRpc, compactions, notifyPromptSettled, eventStream, onInputDead, shared, promptResults, }: Pick<AcpExecutorSupport, "interruptedTurnIds" | "connection" | "cancelGraceMs" | "options" | "promptMutex" | "randomId" | "nowMs" | "compactions" | "eventStream" | "onInputDead" | "shared"> & Pick<ReturnType<typeof createExecutorRuntime>, "failIfDisposed" | "waitForPromptIdle" | "isLive" | "closeActiveAssistantSegment" | "emit" | "stamp" | "notifyPromptSettled"> & Pick<ReturnType<typeof createExecutorUpdates>, "emitCompactionState"> & Pick<ReturnType<typeof createExecutorRequests>, "settleAllApprovals" | "settleAllUserInputs"> & Pick<ReturnType<typeof createExecutorSettlement>, "abortPendingSettlement"> & Pick<ReturnType<typeof createExecutorSession>, "requireStarted"> & Pick<ReturnType<typeof createExecutorPrompt>, "sendPromptRpc"> & {
10
+ promptResults: ReturnType<typeof createPromptResults>;
11
+ }): {
9
12
  cancel: (turnId?: string) => Promise<void>;
10
13
  compact: (input: {
11
14
  readonly commandName: string;
@@ -1 +1 @@
1
- {"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/executor/lifecycle.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAoB,MAAM,cAAc,CAAC;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,wBAAgB,uBAAuB,CAAC,EACtC,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,KAAK,EACL,mBAAmB,EACnB,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,WAAW,EACX,MAAM,GACP,EAAE,IAAI,CACL,kBAAkB,EAChB,oBAAoB,GACpB,YAAY,GACZ,eAAe,GACf,SAAS,GACT,aAAa,GACb,UAAU,GACV,OAAO,GACP,aAAa,GACb,aAAa,GACb,aAAa,GACb,QAAQ,CACX,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,GACR,6BAA6B,GAC7B,MAAM,GACN,OAAO,GACP,qBAAqB,CACxB,GACD,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,qBAAqB,CAAC,GACrE,IAAI,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,EAAE,oBAAoB,GAAG,qBAAqB,CAAC,GAC7F,IAAI,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,EAAE,wBAAwB,CAAC,GAC3E,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,gBAAgB,CAAC,GAChE,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,eAAe,CAAC;sBAC/B,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;qBA8CvB;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,IAAI,CAAC;mBA0EpD,OAAO,CAAC,IAAI,CAAC;EA8BxC"}
1
+ {"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/executor/lifecycle.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAoB,MAAM,cAAc,CAAC;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,wBAAgB,uBAAuB,CAAC,EACtC,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,KAAK,EACL,mBAAmB,EACnB,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,WAAW,EACX,MAAM,EACN,aAAa,GACd,EAAE,IAAI,CACL,kBAAkB,EAChB,oBAAoB,GACpB,YAAY,GACZ,eAAe,GACf,SAAS,GACT,aAAa,GACb,UAAU,GACV,OAAO,GACP,aAAa,GACb,aAAa,GACb,aAAa,GACb,QAAQ,CACX,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,gBAAgB,GAChB,mBAAmB,GACnB,QAAQ,GACR,6BAA6B,GAC7B,MAAM,GACN,OAAO,GACP,qBAAqB,CACxB,GACD,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,qBAAqB,CAAC,GACrE,IAAI,CAAC,UAAU,CAAC,OAAO,sBAAsB,CAAC,EAAE,oBAAoB,GAAG,qBAAqB,CAAC,GAC7F,IAAI,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,EAAE,wBAAwB,CAAC,GAC3E,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,gBAAgB,CAAC,GAChE,IAAI,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,EAAE,eAAe,CAAC,GAAG;IAC/D,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CACvD;sBAC8B,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;qBAuDvB;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,IAAI,CAAC;mBA2E1D,OAAO,CAAC,IAAI,CAAC;EAmClC"}
@@ -3,11 +3,12 @@
3
3
  // @effect-diagnostics globalTimers:off
4
4
  import { AcpExecutorCancelTimeoutError, AcpExecutorDisposedError, AcpExecutorError, } from "../errors.js";
5
5
  import {} from "../protocol.js";
6
- export function createExecutorLifecycle({ failIfDisposed, requireStarted, interruptedTurnIds, settleAllApprovals, settleAllUserInputs, abortPendingSettlement, connection, waitForPromptIdle, cancelGraceMs, isLive, closeActiveAssistantSegment, emit, stamp, options, promptMutex, randomId, nowMs, emitCompactionState, sendPromptRpc, compactions, notifyPromptSettled, eventStream, onInputDead, shared, }) {
6
+ export function createExecutorLifecycle({ failIfDisposed, requireStarted, interruptedTurnIds, settleAllApprovals, settleAllUserInputs, abortPendingSettlement, connection, waitForPromptIdle, cancelGraceMs, isLive, closeActiveAssistantSegment, emit, stamp, options, promptMutex, randomId, nowMs, emitCompactionState, sendPromptRpc, compactions, notifyPromptSettled, eventStream, onInputDead, shared, promptResults, }) {
7
7
  const cancel = async (turnId) => {
8
8
  failIfDisposed();
9
9
  const started = requireStarted();
10
10
  const targetTurnId = turnId ?? shared.activeTurnId;
11
+ promptResults.stop(targetTurnId);
11
12
  if (targetTurnId !== undefined) {
12
13
  interruptedTurnIds.add(targetTurnId);
13
14
  }
@@ -18,6 +19,11 @@ export function createExecutorLifecycle({ failIfDisposed, requireStarted, interr
18
19
  if (shared.sessionId) {
19
20
  await connection.notify("session/cancel", { sessionId: shared.sessionId });
20
21
  }
22
+ await promptResults.wait(targetTurnId);
23
+ if (targetTurnId !== undefined &&
24
+ shared.activeTurnId !== targetTurnId &&
25
+ !interruptedTurnIds.has(targetTurnId))
26
+ return;
21
27
  const settled = await waitForPromptIdle(cancelGraceMs);
22
28
  if (!settled) {
23
29
  throw new AcpExecutorCancelTimeoutError();
@@ -38,6 +44,7 @@ export function createExecutorLifecycle({ failIfDisposed, requireStarted, interr
38
44
  payload: { state: "cancelled", stopReason: "cancelled" },
39
45
  });
40
46
  interruptedTurnIds.delete(targetTurnId);
47
+ promptResults.forget(targetTurnId);
41
48
  }
42
49
  }
43
50
  }
@@ -117,33 +124,40 @@ export function createExecutorLifecycle({ failIfDisposed, requireStarted, interr
117
124
  emitSessionState("ready");
118
125
  }
119
126
  };
120
- const dispose = async () => {
121
- if (shared.disposed) {
122
- return;
123
- }
127
+ let disposing;
128
+ const dispose = () => {
129
+ if (disposing)
130
+ return disposing;
131
+ shared.disposing = true;
132
+ promptResults.stop();
124
133
  settleAllApprovals("cancel");
125
134
  settleAllUserInputs();
126
135
  abortPendingSettlement("executor disposed");
127
136
  notifyPromptSettled();
128
137
  shared.abortLocalPrompt?.();
129
- emit({
130
- type: "session.exited",
131
- ...stamp(),
132
- provider: options.provider,
133
- threadId: options.threadId,
134
- payload: { reason: "disposed" },
135
- });
136
- shared.disposed = true;
137
- shared.generation += 1;
138
- shared.status = "disposed";
139
- eventStream.close();
140
- options.readable.off("end", onInputDead);
141
- options.readable.off("error", onInputDead);
142
- options.readable.pause();
143
- if (!shared.connectionClosed) {
144
- await connection.awaitInboundIdle().catch(() => undefined);
145
- await connection.close().catch(() => undefined);
146
- }
138
+ disposing = (async () => {
139
+ promptResults.finishUnreceived();
140
+ await promptResults.wait();
141
+ emit({
142
+ type: "session.exited",
143
+ ...stamp(),
144
+ provider: options.provider,
145
+ threadId: options.threadId,
146
+ payload: { reason: "disposed" },
147
+ });
148
+ shared.disposed = true;
149
+ shared.generation += 1;
150
+ shared.status = "disposed";
151
+ eventStream.close();
152
+ options.readable.off("end", onInputDead);
153
+ options.readable.off("error", onInputDead);
154
+ options.readable.pause();
155
+ if (!shared.connectionClosed) {
156
+ await connection.awaitInboundIdle().catch(() => undefined);
157
+ await connection.close().catch(() => undefined);
158
+ }
159
+ })();
160
+ return disposing;
147
161
  };
148
162
  return { cancel, compact, dispose };
149
163
  }
@@ -1 +1 @@
1
- {"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/executor/lifecycle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/executor/lifecycle.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,qCAAqC;AACrC,uCAAuC;AACvC,OAAO,EACL,6BAA6B,EAC7B,wBAAwB,EACxB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAuB,MAAM,gBAAgB,CAAC;AAUrD,MAAM,UAAU,uBAAuB,CAAC,EACtC,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,KAAK,EACL,mBAAmB,EACnB,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,WAAW,EACX,MAAM,EACN,aAAa,GA+BZ;IACD,MAAM,MAAM,GAAG,KAAK,EAAE,MAAe,EAAiB,EAAE;QACtD,cAAc,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;QACjC,MAAM,YAAY,GAAG,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC;QACnD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjC,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACvC,CAAC;QACD,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC7B,mBAAmB,EAAE,CAAC;QACtB,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;QAEzC,MAAM,SAAS,GAAG,KAAK,IAAmB,EAAE;YAC1C,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBACrB,MAAM,UAAU,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;YAC7E,CAAC;YACD,MAAM,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACvC,IACE,YAAY,KAAK,SAAS;gBAC1B,MAAM,CAAC,YAAY,KAAK,YAAY;gBACpC,CAAC,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC;gBAErC,OAAO;YACT,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,aAAa,CAAC,CAAC;YACvD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,6BAA6B,EAAE,CAAC;YAC5C,CAAC;YACD,IAAI,YAAY,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC7D,IAAI,MAAM,CAAC,YAAY,KAAK,YAAY,IAAI,kBAAkB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;oBACjF,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBAChC,2BAA2B,CAAC,YAAY,CAAC,CAAC;wBAC1C,MAAM,CAAC,eAAe,GAAG,CAAC,CAAC;wBAC3B,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC;wBAChC,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC;wBACxB,IAAI,CAAC;4BACH,IAAI,EAAE,gBAAgB;4BACtB,GAAG,KAAK,EAAE;4BACV,QAAQ,EAAE,OAAO,CAAC,QAAQ;4BAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;4BAC1B,MAAM,EAAE,YAAY;4BACpB,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE;yBACzD,CAAC,CAAC;wBACH,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;wBACxC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBACrC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,yDAAyD;QACzD,4CAA4C;QAC5C,sCAAsC;QACtC,MAAM,SAAS,EAAE,CAAC;IACpB,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,KAAK,EAAE,KAAuC,EAAiB,EAAE;QAC/E,cAAc,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;QACjC,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QACrF,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;YAC9E,MAAM,IAAI,gBAAgB,CACxB,qBAAqB,EACrB,qCAAqC,WAAW,UAAU,CAC3D,CAAC;QACJ,CAAC;QACD,IACE,MAAM,CAAC,eAAe,GAAG,CAAC;YAC1B,WAAW,CAAC,QAAQ;YACpB,MAAM,CAAC,gBAAgB,KAAK,SAAS,EACrC,CAAC;YACD,MAAM,IAAI,gBAAgB,CACxB,MAAM,EACN,8DAA8D,CAC/D,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAqB;YAC/B,UAAU,EAAE,QAAQ,EAAE;YACtB,OAAO,EAAE,QAAQ;YACjB,WAAW,EAAE,KAAK,EAAE;YACpB,OAAO,EAAE,SAAS;YAClB,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,KAAK;SACf,CAAC;QACF,oDAAoD;QACpD,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;QAC5B,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC;QACjC,MAAM,gBAAgB,GAAG,CAAC,KAA6B,EAAQ,EAAE;YAC/D,IAAI,CAAC;gBACH,IAAI,EAAE,uBAAuB;gBAC7B,GAAG,KAAK,EAAE;gBACV,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE;aACzC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,IAAI,CAAC;YACH,cAAc,EAAE,CAAC;YACjB,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,mBAAmB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC1C,IAAI,QAAwB,CAAC;YAC7B,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE;oBAChD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,WAAW,EAAE,EAAE;iBAC1C,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,MAAM,CAAC,QAAQ;oBAAE,MAAM,IAAI,wBAAwB,EAAE,CAAC;gBAC1D,MAAM,KAAK,CAAC;YACd,CAAC;YACD,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAC;YACpC,IAAI,QAAQ,CAAC,UAAU,KAAK,WAAW,EAAE,CAAC;gBACxC,OAAO;YACT,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACrB,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACvB,mBAAmB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,WAAW,EAAE,CAAC;gBAC7C,IAAI,OAAO,KAAK,MAAM;oBAAE,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtD,CAAC;YACD,MAAM,CAAC,gBAAgB,GAAG,SAAS,CAAC;YACpC,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,mBAAmB,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,SAAoC,CAAC;IACzC,MAAM,OAAO,GAAG,GAAkB,EAAE;QAClC,IAAI,SAAS;YAAE,OAAO,SAAS,CAAC;QAChC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,aAAa,CAAC,IAAI,EAAE,CAAC;QACrB,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC7B,mBAAmB,EAAE,CAAC;QACtB,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;QAC5C,mBAAmB,EAAE,CAAC;QACtB,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC5B,SAAS,GAAG,CAAC,KAAK,IAAI,EAAE;YACtB,aAAa,CAAC,gBAAgB,EAAE,CAAC;YACjC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;YAC3B,IAAI,CAAC;gBACH,IAAI,EAAE,gBAAgB;gBACtB,GAAG,KAAK,EAAE;gBACV,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE;aAChC,CAAC,CAAC;YACH,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;YACvB,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;YACvB,MAAM,CAAC,MAAM,GAAG,UAAU,CAAC;YAC3B,WAAW,CAAC,KAAK,EAAE,CAAC;YACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YACzC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAC3C,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAC7B,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAC3D,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAClD,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AACtC,CAAC"}
@@ -0,0 +1,30 @@
1
+ import type { PromptResponse } from "../protocol.ts";
2
+ import type { AcpExecutorSupport } from "./support.ts";
3
+ type PromptIdentity = {
4
+ readonly promptId: string;
5
+ readonly sessionId: string;
6
+ readonly generation: number;
7
+ readonly turnId: string;
8
+ };
9
+ export type PromptResult = PromptIdentity & {
10
+ response?: PromptResponse;
11
+ rejected: boolean;
12
+ interrupted: boolean;
13
+ finished: boolean;
14
+ readonly done: Promise<void>;
15
+ readonly resolve: () => void;
16
+ readonly finish: () => void;
17
+ };
18
+ export declare function createPromptResults({ options, shared, }: Pick<AcpExecutorSupport, "options" | "shared">): {
19
+ add: (identity: PromptIdentity, finish: () => void) => PromptResult;
20
+ receive: (promptId: string, response: PromptResponse) => void;
21
+ reject: (promptId: string) => void;
22
+ stop: (turnId?: string) => void;
23
+ complete: (record: PromptResult) => void;
24
+ hasInterrupted: (turnId: string) => boolean;
25
+ forget: (turnId: string) => void;
26
+ wait: (turnId?: string) => Promise<void>;
27
+ finishUnreceived: () => void;
28
+ };
29
+ export {};
30
+ //# sourceMappingURL=prompt-results.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prompt-results.d.ts","sourceRoot":"","sources":["../../src/executor/prompt-results.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,KAAK,cAAc,GAAG;IACpB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG;IAC1C,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;CAC7B,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,QAAQ,CAAC;oBAExB,cAAc,UAAU,MAAM,IAAI,KAAG,YAAY;wBAe7C,MAAM,YAAY,cAAc,KAAG,IAAI;uBAWxC,MAAM,KAAG,IAAI;oBAIhB,MAAM,KAAG,IAAI;uBAWV,YAAY,KAAG,IAAI;6BAIb,MAAM,KAAG,OAAO;qBAExB,MAAM,KAAG,IAAI;oBASR,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;4BAuBtB,IAAI;EAclC"}
@@ -0,0 +1,96 @@
1
+ export function createPromptResults({ options, shared, }) {
2
+ const prompts = new Map();
3
+ const add = (identity, finish) => {
4
+ const { promise: done, resolve } = Promise.withResolvers();
5
+ const record = {
6
+ ...identity,
7
+ finish,
8
+ done,
9
+ resolve,
10
+ rejected: false,
11
+ interrupted: false,
12
+ finished: false,
13
+ };
14
+ prompts.set(record.promptId, record);
15
+ return record;
16
+ };
17
+ // 接收边界同步认领;提前通知和 RPC 应答共用同一条记录,先到的结果不会被迟到帧覆盖。
18
+ const receive = (promptId, response) => {
19
+ const record = prompts.get(promptId);
20
+ if (!record || record.finished || record.rejected || record.response !== undefined)
21
+ return;
22
+ if (shared.disposed ||
23
+ shared.generation !== record.generation ||
24
+ shared.sessionId !== record.sessionId)
25
+ return;
26
+ record.response = response;
27
+ };
28
+ const reject = (promptId) => {
29
+ const record = prompts.get(promptId);
30
+ if (record && record.response === undefined)
31
+ record.rejected = true;
32
+ };
33
+ const stop = (turnId) => {
34
+ for (const record of prompts.values()) {
35
+ if (!record.finished &&
36
+ (turnId === undefined || record.turnId === turnId) &&
37
+ record.response === undefined) {
38
+ record.interrupted = true;
39
+ }
40
+ }
41
+ };
42
+ const complete = (record) => {
43
+ record.finished = true;
44
+ record.resolve();
45
+ };
46
+ const hasInterrupted = (turnId) => [...prompts.values()].some((record) => record.turnId === turnId && record.interrupted);
47
+ const forget = (turnId) => {
48
+ for (const [id, record] of prompts) {
49
+ if (record.turnId === turnId) {
50
+ complete(record);
51
+ prompts.delete(id);
52
+ }
53
+ }
54
+ };
55
+ // 只等已认领的结果发布;上限不罩 RPC、取消通知或连接清理。超时跳过可选补充信息,结果不改判。
56
+ const wait = async (turnId) => {
57
+ const claimed = [...prompts.values()].filter((record) => !record.finished &&
58
+ record.response !== undefined &&
59
+ (turnId === undefined || record.turnId === turnId));
60
+ if (claimed.length === 0)
61
+ return;
62
+ let timer;
63
+ try {
64
+ const drained = await Promise.race([
65
+ Promise.all(claimed.map((record) => record.done)).then(() => true),
66
+ new Promise((resolve) => {
67
+ timer = setTimeout(() => resolve(false), options.resultDrainTimeoutMs ?? 2_000);
68
+ }),
69
+ ]);
70
+ if (drained)
71
+ return;
72
+ options.log?.warn?.("ACP result settlement timed out", { threadId: options.threadId });
73
+ for (const record of claimed)
74
+ if (!record.finished)
75
+ record.finish();
76
+ }
77
+ finally {
78
+ clearTimeout(timer);
79
+ }
80
+ };
81
+ const finishUnreceived = () => {
82
+ const claimedTurns = new Set([...prompts.values()]
83
+ .filter((record) => !record.finished && record.response !== undefined)
84
+ .map((record) => record.turnId));
85
+ for (const record of prompts.values()) {
86
+ if (!record.finished && record.response === undefined) {
87
+ if (claimedTurns.has(record.turnId))
88
+ record.finish();
89
+ else
90
+ complete(record);
91
+ }
92
+ }
93
+ };
94
+ return { add, receive, reject, stop, complete, hasInterrupted, forget, wait, finishUnreceived };
95
+ }
96
+ //# sourceMappingURL=prompt-results.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prompt-results.js","sourceRoot":"","sources":["../../src/executor/prompt-results.ts"],"names":[],"mappings":"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"}
@@ -4,8 +4,11 @@ import type { createExecutorRuntime } from "./runtime.ts";
4
4
  import type { createExecutorSession } from "./session.ts";
5
5
  import type { createExecutorSettlement } from "./settlement.ts";
6
6
  import type { AcpExecutorSupport } from "./support.ts";
7
- export declare function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit, stamp, options, interruptedTurnIds, hooks, randomId, connection, rememberSettledPromptKey, failIfDisposed, requireStarted, threadMutex, promptMutex, applyRequestedModel, notifyPromptSettled, shared, }: Pick<AcpExecutorSupport, "options" | "interruptedTurnIds" | "hooks" | "randomId" | "connection" | "threadMutex" | "promptMutex" | "shared"> & Pick<ReturnType<typeof createExecutorRuntime>, "isLive" | "closeActiveAssistantSegment" | "emit" | "stamp" | "failIfDisposed" | "notifyPromptSettled"> & Pick<ReturnType<typeof createExecutorSettlement>, "rememberSettledPromptKey"> & Pick<ReturnType<typeof createExecutorSession>, "requireStarted" | "applyRequestedModel">): {
8
- sendPromptRpc: (sessionId: string, promptParts: ReadonlyArray<AcpContentBlock>, onWritten?: () => void) => Promise<PromptResponse>;
7
+ import type { createPromptResults, PromptResult } from "./prompt-results.ts";
8
+ export declare function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit, stamp, options, interruptedTurnIds, hooks, randomId, connection, rememberSettledPromptKey, failIfDisposed, requireStarted, threadMutex, promptMutex, applyRequestedModel, notifyPromptSettled, shared, promptResults, }: Pick<AcpExecutorSupport, "options" | "interruptedTurnIds" | "hooks" | "randomId" | "connection" | "threadMutex" | "promptMutex" | "shared"> & Pick<ReturnType<typeof createExecutorRuntime>, "isLive" | "closeActiveAssistantSegment" | "emit" | "stamp" | "failIfDisposed" | "notifyPromptSettled"> & Pick<ReturnType<typeof createExecutorSettlement>, "rememberSettledPromptKey"> & Pick<ReturnType<typeof createExecutorSession>, "requireStarted" | "applyRequestedModel"> & {
9
+ promptResults: ReturnType<typeof createPromptResults>;
10
+ }): {
11
+ sendPromptRpc: (sessionId: string, promptParts: ReadonlyArray<AcpContentBlock>, onWritten?: () => void, record?: PromptResult) => Promise<PromptResponse>;
9
12
  prompt: (input: AcpPromptInput) => Promise<AcpTurnResult>;
10
13
  };
11
14
  //# sourceMappingURL=prompt.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/executor/prompt.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,kBAAkB,EAClB,KAAK,EACL,QAAQ,EACR,UAAU,EACV,wBAAwB,EACxB,cAAc,EACd,cAAc,EACd,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,MAAM,GACP,EAAE,IAAI,CACL,kBAAkB,EAChB,SAAS,GACT,oBAAoB,GACpB,OAAO,GACP,UAAU,GACV,YAAY,GACZ,aAAa,GACb,aAAa,GACb,QAAQ,CACX,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,QAAQ,GACR,6BAA6B,GAC7B,MAAM,GACN,OAAO,GACP,gBAAgB,GAChB,qBAAqB,CACxB,GACD,IAAI,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,EAAE,0BAA0B,CAAC,GAC7E,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAAC;+BAuD3E,MAAM,eACJ,aAAa,CAAC,eAAe,CAAC,cAC/B,MAAM,IAAI,KACrB,OAAO,CAAC,cAAc,CAAC;oBAkDG,cAAc,KAAG,OAAO,CAAC,aAAa,CAAC;EAkMrE"}
1
+ {"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/executor/prompt.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAE7E,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,kBAAkB,EAClB,KAAK,EACL,QAAQ,EACR,UAAU,EACV,wBAAwB,EACxB,cAAc,EACd,cAAc,EACd,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,MAAM,EACN,aAAa,GACd,EAAE,IAAI,CACL,kBAAkB,EAChB,SAAS,GACT,oBAAoB,GACpB,OAAO,GACP,UAAU,GACV,YAAY,GACZ,aAAa,GACb,aAAa,GACb,QAAQ,CACX,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,QAAQ,GACR,6BAA6B,GAC7B,MAAM,GACN,OAAO,GACP,gBAAgB,GAChB,qBAAqB,CACxB,GACD,IAAI,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,EAAE,0BAA0B,CAAC,GAC7E,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAAC,GAAG;IACzF,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CACvD;+BA2DY,MAAM,eACJ,aAAa,CAAC,eAAe,CAAC,cAC/B,MAAM,IAAI,WACb,YAAY,KACpB,OAAO,CAAC,cAAc,CAAC;oBAkEG,cAAc,KAAG,OAAO,CAAC,aAAa,CAAC;EAsNrE"}