@ycodium-ai/agent-acp 0.2.2800 → 0.2.2834

package/dist/index.js

@@ -23885,22 +23885,28 @@ function createAcpConnection(options) {
   options.readable.on("end", onEnd);
   options.readable.on("error", onError);
   options.writable.once("error", onWritableError);
-  const request = (async (method, params) => {
+  const begin = (method, params) => {
     failIfClosed();
     const id = nextRequestId;
     nextRequestId += 1;
     const { promise: promise2, resolve: resolve2, reject } = Promise.withResolvers();
     pending.set(String(id), { method, resolve: resolve2, reject });
     const message = params === void 0 ? { jsonrpc: "2.0", id, method } : { jsonrpc: "2.0", id, method, params };
-    try {
-      await Promise.race([writeMessage(message), promise2]);
-    } catch (error62) {
-      if (pending.delete(String(id))) {
-        reject(error62);
+    const written = Promise.race([writeMessage(message), promise2]).then(
+      () => void 0,
+      (error62) => {
+        if (pending.delete(String(id))) {
+          reject(error62);
+        }
+        throw error62;
       }
-      throw error62;
-    }
-    return promise2;
+    );
+    return { written, response: promise2 };
+  };
+  const request = (async (method, params) => {
+    const { written, response } = begin(method, params);
+    await written;
+    return response;
   });
   const notify = async (method, params) => {
     failIfClosed();
@@ -23921,6 +23927,7 @@ function createAcpConnection(options) {
   const close = (error62) => shutdown(error62 ?? new AcpConnectionClosedError());
   return {
     request,
+    begin,
     notify,
     awaitInboundIdle,
     close,
@@ -25353,6 +25360,13 @@ function modelSelectionStateFromSetup(setup) {
   };
 }
 
+// ../../packages/ycodium-acp-executor/src/user-input-pending.ts
+var userInputAnswerOptionId = (question, answers) => {
+  const answer = answers[question.id];
+  const selected = typeof answer === "string" ? answer : Array.isArray(answer) && answer.length === 1 && typeof answer[0] === "string" ? answer[0] : void 0;
+  return selected !== void 0 && question.options.some((option) => option.id === selected) ? selected : void 0;
+};
+
 // ../../packages/ycodium-acp-executor/src/vendor-hooks.ts
 var defaultVendorHooks = {
   completedStopReason: (response) => response.stopReason
@@ -25360,11 +25374,6 @@ var defaultVendorHooks = {
 
 // ../../packages/ycodium-acp-executor/src/executor.ts
 var DEFAULT_CANCEL_GRACE_MS = 5e3;
-var userInputAnswerOptionId = (question, answers) => {
-  const answer = answers[question.id];
-  const selected = typeof answer === "string" ? answer : Array.isArray(answer) && answer.length === 1 && typeof answer[0] === "string" ? answer[0] : void 0;
-  return selected !== void 0 && question.options.some((option) => option.id === selected) ? selected : void 0;
-};
 function defaultNowIso() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -26188,7 +26197,7 @@ function createAcpExecutor(options) {
   };
   const settleTurn = (input2) => {
     if (!isLive(input2.expectedGeneration)) {
-      return;
+      return false;
     }
     if (!acpPromptSettlementBelongsToContext({
       liveAcpSessionId: sessionId ?? "",
@@ -26197,37 +26206,40 @@ function createAcpExecutor(options) {
       liveSessionActiveTurnId: activeTurnId,
       turnId: input2.turnId
     })) {
-      return;
+      return false;
     }
     closeActiveAssistantSegment(input2.turnId);
     promptsInFlight = Math.max(0, promptsInFlight - 1);
-    if (promptsInFlight === 0 && activeTurnId === input2.turnId) {
-      activeTurnId = void 0;
-      if (status !== "disposed") {
-        status = "ready";
-      }
-      emit({
-        type: "turn.completed",
-        ...stamp(),
-        provider: options.provider,
-        threadId: options.threadId,
-        turnId: input2.turnId,
-        payload: {
-          state: input2.state,
-          stopReason: input2.stopReason
-        }
-      });
-      interruptedTurnIds.delete(input2.turnId);
+    if (promptsInFlight !== 0 || activeTurnId !== input2.turnId) return false;
+    activeTurnId = void 0;
+    if (status !== "disposed") {
+      status = "ready";
     }
+    emit({
+      type: "turn.completed",
+      ...stamp(),
+      provider: options.provider,
+      threadId: options.threadId,
+      turnId: input2.turnId,
+      payload: {
+        state: input2.state,
+        stopReason: input2.stopReason,
+        ...input2.errorMessage === void 0 ? {} : { errorMessage: input2.errorMessage }
+      }
+    });
+    interruptedTurnIds.delete(input2.turnId);
+    return true;
   };
-  const sendPromptRpc = async (sessionId2, promptParts) => {
+  const sendPromptRpc = async (sessionId2, promptParts, onWritten) => {
     const settlementHooks = hooks.promptSettlement;
     const promptKey = settlementHooks === void 0 ? void 0 : randomId();
-    const promptRpc = connection.request("session/prompt", {
+    const pending = connection.begin("session/prompt", {
       sessionId: sessionId2,
       prompt: promptParts,
       ...settlementHooks !== void 0 && promptKey !== void 0 ? settlementHooks.requestFields(promptKey) : {}
     });
+    void pending.written.then(onWritten, () => void 0);
+    const promptRpc = pending.response;
     if (settlementHooks === void 0 || promptKey === void 0) {
       return await promptRpc;
     } else {
@@ -26253,6 +26265,11 @@ function createAcpExecutor(options) {
   const prompt = async (input2) => {
     failIfDisposed();
     const started = requireStarted();
+    const settle2 = (rest) => settleTurn({
+      expectedGeneration: started.generation,
+      expectedSessionId: started.sessionId,
+      ...rest
+    });
     let turnId;
     await threadMutex.acquire();
     try {
@@ -26280,13 +26297,7 @@ function createAcpExecutor(options) {
     try {
       failIfDisposed();
       if (interruptedTurnIds.has(turnId)) {
-        settleTurn({
-          expectedGeneration: started.generation,
-          expectedSessionId: started.sessionId,
-          turnId,
-          stopReason: "cancelled",
-          state: "cancelled"
-        });
+        settle2({ turnId, stopReason: "cancelled", state: "cancelled" });
         return {
           threadId: options.threadId,
           turnId,
@@ -26300,12 +26311,24 @@ function createAcpExecutor(options) {
         expectedGeneration: started.generation
       });
       closeActiveAssistantSegment(turnId);
+      let written = false;
       try {
-        response = await sendPromptRpc(started.sessionId, promptParts);
+        response = await sendPromptRpc(started.sessionId, promptParts, () => {
+          written = true;
+          input2.onDispatched?.(turnId);
+        });
       } catch (error62) {
         if (disposed) {
           throw new AcpExecutorDisposedError();
         }
+        if (written && input2.onDispatched !== void 0 && !interruptedTurnIds.has(turnId)) {
+          const errorMessage = error62 instanceof Error && error62.message.trim() || "ACP prompt failed";
+          if (settle2({ turnId, stopReason: "error", state: "failed", errorMessage }))
+            options.log?.warn?.("turn failed after dispatch", {
+              threadId: options.threadId,
+              failure: errorMessage
+            });
+        }
         throw error62;
       }
       await connection.awaitInboundIdle();
@@ -26336,13 +26359,7 @@ function createAcpExecutor(options) {
     }
     const finishPrompt = () => {
       if (interruptedTurnIds.has(settledTurnId)) {
-        settleTurn({
-          expectedGeneration: started.generation,
-          expectedSessionId: started.sessionId,
-          turnId: settledTurnId,
-          stopReason: "cancelled",
-          state: "cancelled"
-        });
+        settle2({ turnId: settledTurnId, stopReason: "cancelled", state: "cancelled" });
         return {
           threadId: options.threadId,
           turnId: settledTurnId,
@@ -26365,9 +26382,7 @@ function createAcpExecutor(options) {
           }
         });
       }
-      settleTurn({
-        expectedGeneration: started.generation,
-        expectedSessionId: started.sessionId,
+      settle2({
         turnId: settledTurnId,
         stopReason,
         state: response.stopReason === "cancelled" ? "cancelled" : "completed"
@@ -26625,6 +26640,17 @@ function createAcpExecutor(options) {
   };
 }
 
+// ../../packages/ycodium-acp-executor/src/prompt-dispatch.ts
+var dispatchAcpPrompt = (executor, input2) => {
+  const { promise: dispatched, resolve: resolve2 } = Promise.withResolvers();
+  const finished = executor.prompt({ ...input2, onDispatched: resolve2 });
+  return Promise.race([
+    dispatched.then((turnId) => ({ turnId })),
+    // 写入之前就落定：成功（写入前被取消）带 turnId；拒绝原样交给调用方，那是起轮失败。
+    finished.then((result) => ({ turnId: result.turnId }))
+  ]);
+};
+
 // ../../packages/ycodium-acp-executor/src/mcp-servers.ts
 function toAcpMcpServers(entries) {
   return (entries ?? []).map(
@@ -27287,26 +27313,14 @@ var createAcpInstance = (config2, host) => {
         void booked.executor.cancel(input2.expectedTurnId).catch(() => void 0);
       };
       signal?.addEventListener("abort", onAbort);
-      booked.session = {
-        ...booked.session,
-        status: "running",
-        updatedAt: nowIso()
-      };
       try {
         const requestedModelId = modelIdFromSelection(input2.modelSelection);
-        const turn = await booked.executor.prompt({
+        const turn = await dispatchAcpPrompt(booked.executor, {
           text: input2.input ?? "",
           ...input2.expectedTurnId === void 0 ? {} : { turnId: input2.expectedTurnId },
           ...requestedModelId === void 0 ? {} : { requestedModelId }
         });
-        await yieldTick();
         booked.turns.push({ id: turn.turnId, items: [] });
-        booked.session = {
-          ...booked.session,
-          status: "idle",
-          updatedAt: nowIso(),
-          ...booked.executor.modelId === void 0 ? {} : { model: booked.executor.modelId }
-        };
         return {
           threadId: input2.threadId,
           turnId: turn.turnId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-acp",
-  "version": "0.2.2800",
+  "version": "0.2.2834",
   "description": "Generic ACP executor: user-supplied CLI over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -21,9 +21,9 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.2800",
+    "ycodium-acp-executor": "0.2.2834",
     "ycodium-executor-testing": "0.0.0",
-    "ycodium-acp-executor": "0.2.2800"
+    "@ycodium-ai/plugin-api": "0.2.2834"
   },
   "ycodium": {
     "plugin": "./dist/index.js",