ycodium-acp-executor 0.2.3072 → 0.2.3076

package/dist/prompt-dispatch.d.ts

@@ -6,7 +6,7 @@ export type AcpDispatchedPrompt = {
 /**
  * 发一轮 prompt，在 `session/prompt` 写进对端 stdin 时就返回，不等整轮跑完：插件的 `sendTurn`
  * 据此交出投递确认（规则 13 的判据），整轮结果走 `turn.completed`。写入之前就失败（会话已关、
- * 换模型失败）照旧 reject；写入之前就被取消，按执行器给的 cancelled 结果返回。
+ * 换模型失败）照旧 reject；插话未写出就被取消，必须拒收，不能确认投递。普通 prompt 保留取消结果。
  *
  * 会话忙闲以 `executor.status` 为准；写入之后的失败由执行器以 failed 收尾并记日志。
  */

package/dist/prompt-dispatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-dispatch.d.ts","sourceRoot":"","sources":["../src/prompt-dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAC5B,UAAU,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,EACrC,OAAO,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,KAC1C,OAAO,CAAC,mBAAmB,CAQ7B,CAAC"}
+{"version":3,"file":"prompt-dispatch.d.ts","sourceRoot":"","sources":["../src/prompt-dispatch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAC5B,UAAU,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,EACrC,OAAO,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,KAC1C,OAAO,CAAC,mBAAmB,CAuB7B,CAAC"}

package/dist/prompt-dispatch.js

@@ -1,17 +1,31 @@
+import { AcpExecutorTurnEndedError } from "./errors.js";
 /**
  * 发一轮 prompt，在 `session/prompt` 写进对端 stdin 时就返回，不等整轮跑完：插件的 `sendTurn`
  * 据此交出投递确认（规则 13 的判据），整轮结果走 `turn.completed`。写入之前就失败（会话已关、
- * 换模型失败）照旧 reject；写入之前就被取消，按执行器给的 cancelled 结果返回。
+ * 换模型失败）照旧 reject；插话未写出就被取消，必须拒收，不能确认投递。普通 prompt 保留取消结果。
  *
  * 会话忙闲以 `executor.status` 为准；写入之后的失败由执行器以 failed 收尾并记日志。
  */
 export const dispatchAcpPrompt = (executor, input) => {
     const { promise: dispatched, resolve } = Promise.withResolvers();
-    const finished = executor.prompt({ ...input, onDispatched: resolve });
+    let written = false;
+    const finished = executor.prompt({
+        ...input,
+        onDispatched: (turnId) => {
+            written = true;
+            resolve(turnId);
+        },
+    });
     return Promise.race([
         dispatched.then((turnId) => ({ turnId })),
-        // 写入之前就落定：成功（写入前被取消）带 turnId；拒绝原样交给调用方，那是起轮失败。
-        finished.then((result) => ({ turnId: result.turnId })),
+        finished.then((result) => {
+            if (!written &&
+                input.expectedActiveTurnId !== undefined &&
+                result.stopReason === "cancelled") {
+                throw new AcpExecutorTurnEndedError();
+            }
+            return { turnId: result.turnId };
+        }),
     ]);
 };
 //# sourceMappingURL=prompt-dispatch.js.map

package/dist/prompt-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-dispatch.js","sourceRoot":"","sources":["../src/prompt-dispatch.ts"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,QAAqC,EACrC,KAA2C,EACb,EAAE;IAChC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,EAAU,CAAC;IACzE,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC;IACtE,OAAO,OAAO,CAAC,IAAI,CAAC;QAClB,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QACzC,+CAA+C;QAC/C,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;KACvD,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"prompt-dispatch.js","sourceRoot":"","sources":["../src/prompt-dispatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAQxD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,QAAqC,EACrC,KAA2C,EACb,EAAE;IAChC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,aAAa,EAAU,CAAC;IACzE,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC/B,GAAG,KAAK;QACR,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE;YACvB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,CAAC;KACF,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,IAAI,CAAC;QAClB,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QACzC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACvB,IACE,CAAC,OAAO;gBACR,KAAK,CAAC,oBAAoB,KAAK,SAAS;gBACxC,MAAM,CAAC,UAAU,KAAK,WAAW,EACjC,CAAC;gBACD,MAAM,IAAI,yBAAyB,EAAE,CAAC;YACxC,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QACnC,CAAC,CAAC;KACH,CAAC,CAAC;AACL,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ycodium-acp-executor",
-  "version": "0.2.3072",
+  "version": "0.2.3076",
   "description": "Agent Client Protocol client and executor state machine for Ycodium agent plugins. Speaks ACP over stdio and emits Ycodium executor events.",
   "keywords": [
     "acp",
@@ -29,7 +29,8 @@
   "devDependencies": {
     "@types/node": "24.12.4",
     "typescript": "~6.0.3",
-    "vite-plus": "0.2.2"
+    "vite-plus": "0.2.2",
+    "ycodium-executor-testing": "0.0.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

package/dist/testing/heldPromptAgent.d.ts

@@ -1,29 +0,0 @@
-import * as NodeStream from "node:stream";
-export type HeldPromptFrame = {
-    readonly id?: number | string;
-    readonly method?: string;
-    readonly params?: Record<string, unknown>;
-};
-export declare class HeldPromptAgent {
-    readonly clientReadable: NodeStream.PassThrough;
-    readonly clientWritable: NodeStream.PassThrough;
-    readonly frames: HeldPromptFrame[];
-    /** 最近一条 `session/prompt`；每条新的覆盖上一条。 */
-    promptFrame: HeldPromptFrame | undefined;
-    /** false 时收到 prompt 立即以空结果应答（不挂起）。 */
-    holdPrompt: boolean;
-    /** true 时不回答 initialize，用来造握手还没完成连接就断。 */
-    hangInitialize: boolean;
-    /** 收到 `session/cancel` 时以 cancelled 应答挂着的 prompt。 */
-    answerCancel: boolean;
-    /** 并进 `session/new` 应答的字段（比如 `models`）。别的请求（换模型等）不自动应答。 */
-    sessionExtras: Record<string, unknown>;
-    constructor();
-    write(obj: unknown): void;
-    reply(text: string): void;
-    answer(stopReason?: string): void;
-    fail(message: string): void;
-}
-/** 逐个 setImmediate 轮询直到条件成立；5 秒后报出等的是什么。 */
-export declare const waitFor: (isDone: () => boolean, label: string) => Promise<void>;
-//# sourceMappingURL=heldPromptAgent.d.ts.map

package/dist/testing/heldPromptAgent.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"heldPromptAgent.d.ts","sourceRoot":"","sources":["../../src/testing/heldPromptAgent.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAE1C,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC3C,CAAC;AAEF,qBAAa,eAAe;IAC1B,QAAQ,CAAC,cAAc,yBAAgC;IACvD,QAAQ,CAAC,cAAc,yBAAgC;IACvD,QAAQ,CAAC,MAAM,EAAE,eAAe,EAAE,CAAM;IACxC,uCAAuC;IACvC,WAAW,EAAE,eAAe,GAAG,SAAS,CAAC;IACzC,sCAAsC;IACtC,UAAU,UAAQ;IAClB,0CAA0C;IAC1C,cAAc,UAAS;IACvB,qDAAqD;IACrD,YAAY,UAAS;IACrB,2DAA2D;IAC3D,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;;IAiC5C,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIzB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAWzB,MAAM,CAAC,UAAU,SAAa,GAAG,IAAI;IAKrC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CAI5B;AAED,4CAA4C;AAC5C,eAAO,MAAM,OAAO,GAAU,QAAQ,MAAM,OAAO,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,IAAI,CAMhF,CAAC"}

package/dist/testing/heldPromptAgent.js

@@ -1,93 +0,0 @@
-// @effect-diagnostics nodeBuiltinImport:off globalDate:off - 测试用的进程内假 ACP agent；waitFor 的截止用 Date.now()。
-/**
- * 测试用的进程内假 ACP agent：答 initialize 与 session/new（会话 `sess-1`），收到
- * `session/prompt` 默认只记下、不应答，由用例决定何时推回复、应答或报错。厂商私有的帧
- * （提前收口通知等）由各用例经 `write` 自己写。
- */
-import * as NodeReadline from "node:readline";
-import * as NodeStream from "node:stream";
-export class HeldPromptAgent {
-    clientReadable = new NodeStream.PassThrough();
-    clientWritable = new NodeStream.PassThrough();
-    frames = [];
-    /** 最近一条 `session/prompt`；每条新的覆盖上一条。 */
-    promptFrame;
-    /** false 时收到 prompt 立即以空结果应答（不挂起）。 */
-    holdPrompt = true;
-    /** true 时不回答 initialize，用来造握手还没完成连接就断。 */
-    hangInitialize = false;
-    /** 收到 `session/cancel` 时以 cancelled 应答挂着的 prompt。 */
-    answerCancel = false;
-    /** 并进 `session/new` 应答的字段（比如 `models`）。别的请求（换模型等）不自动应答。 */
-    sessionExtras = {};
-    constructor() {
-        NodeReadline.createInterface({ input: this.clientWritable }).on("line", (line) => {
-            let frame;
-            try {
-                frame = JSON.parse(line);
-            }
-            catch {
-                return;
-            }
-            this.frames.push(frame);
-            if (frame.method === "initialize") {
-                if (this.hangInitialize)
-                    return;
-                this.write({
-                    jsonrpc: "2.0",
-                    id: frame.id,
-                    result: { protocolVersion: 1, agentCapabilities: {}, agentInfo: { name: "fake" } },
-                });
-            }
-            else if (frame.method === "session/new") {
-                this.write({
-                    jsonrpc: "2.0",
-                    id: frame.id,
-                    result: { sessionId: "sess-1", ...this.sessionExtras },
-                });
-            }
-            else if (frame.method === "session/prompt") {
-                this.promptFrame = frame;
-                if (!this.holdPrompt)
-                    this.write({ jsonrpc: "2.0", id: frame.id, result: {} });
-            }
-            else if (frame.method === "session/cancel" && this.answerCancel) {
-                this.answer("cancelled");
-            }
-        });
-    }
-    write(obj) {
-        if (this.clientReadable.writable)
-            this.clientReadable.write(`${JSON.stringify(obj)}\n`);
-    }
-    reply(text) {
-        this.write({
-            jsonrpc: "2.0",
-            method: "session/update",
-            params: {
-                sessionId: "sess-1",
-                update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text } },
-            },
-        });
-    }
-    answer(stopReason = "end_turn") {
-        if (this.promptFrame === undefined)
-            throw new Error("prompt was not received");
-        this.write({ jsonrpc: "2.0", id: this.promptFrame.id, result: { stopReason } });
-    }
-    fail(message) {
-        if (this.promptFrame === undefined)
-            throw new Error("prompt was not received");
-        this.write({ jsonrpc: "2.0", id: this.promptFrame.id, error: { code: -32603, message } });
-    }
-}
-/** 逐个 setImmediate 轮询直到条件成立；5 秒后报出等的是什么。 */
-export const waitFor = async (isDone, label) => {
-    const deadline = Date.now() + 5_000;
-    while (!isDone()) {
-        if (Date.now() > deadline)
-            throw new Error(`timed out waiting for ${label}`);
-        await new Promise((resolve) => setImmediate(resolve));
-    }
-};
-//# sourceMappingURL=heldPromptAgent.js.map

package/dist/testing/heldPromptAgent.js.map

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