@ycodium-ai/agent-acp 0.2.3130 → 0.2.3158

package/dist/index.js

@@ -24862,7 +24862,10 @@ function createAcpConnection(options) {
     }
     pending.delete(key);
     try {
-      options.onResponse?.(waiter.method);
+      options.onResponse?.(
+        waiter,
+        Object.hasOwn(message, "error") ? { error: message["error"] } : { result: message["result"] }
+      );
     } catch {
     }
     if (Object.hasOwn(message, "error")) {
@@ -24995,12 +24998,17 @@ function createAcpConnection(options) {
   options.readable.on("end", onEnd);
   options.readable.on("error", onError);
   options.writable.once("error", onWritableError);
-  const begin = (method, params) => {
+  const begin = (method, params, promptId) => {
     failIfClosed();
     const id = nextRequestId;
     nextRequestId += 1;
     const { promise: promise2, resolve: resolve2, reject } = Promise.withResolvers();
-    pending.set(String(id), { method, resolve: resolve2, reject });
+    pending.set(String(id), {
+      method,
+      ...promptId === void 0 ? {} : { promptId },
+      resolve: resolve2,
+      reject
+    });
     const message = params === void 0 ? { jsonrpc: "2.0", id, method } : { jsonrpc: "2.0", id, method, params };
     const written = Promise.race([writeMessage(message), promise2]).then(
       () => void 0,
@@ -25070,12 +25078,14 @@ function createExecutorLifecycle({
   notifyPromptSettled,
   eventStream,
   onInputDead,
-  shared
+  shared,
+  promptResults
 }) {
   const cancel = async (turnId) => {
     failIfDisposed();
     const started = requireStarted();
     const targetTurnId = turnId ?? shared.activeTurnId;
+    promptResults.stop(targetTurnId);
     if (targetTurnId !== void 0) {
       interruptedTurnIds.add(targetTurnId);
     }
@@ -25086,6 +25096,9 @@ function createExecutorLifecycle({
       if (shared.sessionId) {
         await connection.notify("session/cancel", { sessionId: shared.sessionId });
       }
+      await promptResults.wait(targetTurnId);
+      if (targetTurnId !== void 0 && shared.activeTurnId !== targetTurnId && !interruptedTurnIds.has(targetTurnId))
+        return;
       const settled = await waitForPromptIdle(cancelGraceMs);
       if (!settled) {
         throw new AcpExecutorCancelTimeoutError();
@@ -25106,6 +25119,7 @@ function createExecutorLifecycle({
               payload: { state: "cancelled", stopReason: "cancelled" }
             });
             interruptedTurnIds.delete(targetTurnId);
+            promptResults.forget(targetTurnId);
           }
         }
       }
@@ -25180,33 +25194,39 @@ function createExecutorLifecycle({
       if (!shared.disposed) emitSessionState("ready");
     }
   };
-  const dispose = async () => {
-    if (shared.disposed) {
-      return;
-    }
+  let disposing;
+  const dispose = () => {
+    if (disposing) return disposing;
+    shared.disposing = true;
+    promptResults.stop();
     settleAllApprovals("cancel");
     settleAllUserInputs();
     abortPendingSettlement("executor disposed");
     notifyPromptSettled();
     shared.abortLocalPrompt?.();
-    emit({
-      type: "session.exited",
-      ...stamp(),
-      provider: options.provider,
-      threadId: options.threadId,
-      payload: { reason: "disposed" }
-    });
-    shared.disposed = true;
-    shared.generation += 1;
-    shared.status = "disposed";
-    eventStream.close();
-    options.readable.off("end", onInputDead);
-    options.readable.off("error", onInputDead);
-    options.readable.pause();
-    if (!shared.connectionClosed) {
-      await connection.awaitInboundIdle().catch(() => void 0);
-      await connection.close().catch(() => void 0);
-    }
+    disposing = (async () => {
+      promptResults.finishUnreceived();
+      await promptResults.wait();
+      emit({
+        type: "session.exited",
+        ...stamp(),
+        provider: options.provider,
+        threadId: options.threadId,
+        payload: { reason: "disposed" }
+      });
+      shared.disposed = true;
+      shared.generation += 1;
+      shared.status = "disposed";
+      eventStream.close();
+      options.readable.off("end", onInputDead);
+      options.readable.off("error", onInputDead);
+      options.readable.pause();
+      if (!shared.connectionClosed) {
+        await connection.awaitInboundIdle().catch(() => void 0);
+        await connection.close().catch(() => void 0);
+      }
+    })();
+    return disposing;
   };
   return { cancel, compact, dispose };
 }
@@ -25310,12 +25330,14 @@ function createExecutorPrompt({
   promptMutex,
   applyRequestedModel,
   notifyPromptSettled,
-  shared
+  shared,
+  promptResults
 }) {
   const settleTurn = (input2) => {
-    if (!isLive(input2.expectedGeneration)) {
+    if (!isLive(input2.expectedGeneration) || input2.record.finished) {
       return false;
     }
+    promptResults.complete(input2.record);
     if (!acpPromptSettlementBelongsToContext({
       liveAcpSessionId: shared.sessionId ?? "",
       expectedAcpSessionId: input2.expectedSessionId,
@@ -25332,6 +25354,7 @@ function createExecutorPrompt({
     if (shared.status !== "disposed") {
       shared.status = "ready";
     }
+    const interrupted = promptResults.hasInterrupted(input2.turnId);
     emit({
       type: "turn.completed",
       ...stamp(),
@@ -25339,30 +25362,44 @@ function createExecutorPrompt({
       threadId: options.threadId,
       turnId: input2.turnId,
       payload: {
-        state: input2.state,
-        stopReason: input2.stopReason,
+        state: interrupted ? "cancelled" : input2.state,
+        stopReason: interrupted ? "cancelled" : input2.stopReason,
         ...input2.errorMessage === void 0 ? {} : { errorMessage: input2.errorMessage },
         ...input2.state === "failed" ? failureCategoryField(input2.failureCategory) : {}
       }
     });
     interruptedTurnIds.delete(input2.turnId);
+    promptResults.forget(input2.turnId);
     return true;
   };
-  const sendPromptRpc = async (sessionId, promptParts, onWritten) => {
+  const sendPromptRpc = async (sessionId, promptParts, onWritten, record2) => {
     const settlementHooks = hooks.promptSettlement;
     const promptKey = settlementHooks === void 0 ? void 0 : randomId();
-    const pending = connection.begin("session/prompt", {
-      sessionId,
-      prompt: promptParts,
-      ...settlementHooks !== void 0 && promptKey !== void 0 ? settlementHooks.requestFields(promptKey) : {}
-    });
+    const pending = connection.begin(
+      "session/prompt",
+      {
+        sessionId,
+        prompt: promptParts,
+        ...settlementHooks !== void 0 && promptKey !== void 0 ? settlementHooks.requestFields(promptKey) : {}
+      },
+      record2?.promptId
+    );
     void pending.written.then(onWritten, () => void 0);
     const promptRpc = pending.response;
     if (settlementHooks === void 0 || promptKey === void 0) {
       return await promptRpc;
     } else {
       const { promise: early, resolve: settleEarly } = Promise.withResolvers();
-      shared.pendingSettlement = { promptKey, sessionId, settle: settleEarly };
+      shared.pendingSettlement = {
+        promptKey,
+        sessionId,
+        settle: settleEarly,
+        ...record2 === void 0 ? {} : {
+          onResponse: (response) => promptResults.receive(record2.promptId, response),
+          onError: () => promptResults.reject(record2.promptId),
+          hasResult: () => record2.response !== void 0
+        }
+      };
       try {
         const outcome = await Promise.race([
           promptRpc.then((value) => {
@@ -25383,9 +25420,11 @@ function createExecutorPrompt({
   const prompt = async (input2) => {
     failIfDisposed();
     const started = requireStarted();
+    let record2;
     const settle2 = (rest) => settleTurn({
       expectedGeneration: started.generation,
       expectedSessionId: started.sessionId,
+      record: record2,
       ...rest
     });
     let turnId;
@@ -25398,6 +25437,17 @@ function createExecutorPrompt({
         randomId
       );
       shared.promptsInFlight += 1;
+      record2 = promptResults.add(
+        {
+          promptId: randomId(),
+          sessionId: started.sessionId,
+          generation: started.generation,
+          turnId
+        },
+        () => {
+          finishPrompt();
+        }
+      );
       shared.activeTurnId = turnId;
       shared.status = "running";
       if (shared.promptsInFlight === 1) {
@@ -25414,6 +25464,42 @@ function createExecutorPrompt({
       threadMutex.release();
     }
     const promptParts = input2.prompt ?? (input2.text !== void 0 ? [{ type: "text", text: input2.text }] : [{ type: "text", text: "" }]);
+    let contextWindow;
+    const finishPrompt = () => {
+      if (!isLive(started.generation) || record2.finished) throw new AcpExecutorDisposedError();
+      const response2 = record2.response;
+      if (record2.interrupted || response2 === void 0) {
+        settle2({ turnId, stopReason: "cancelled", state: "cancelled" });
+        return { threadId: options.threadId, turnId, stopReason: "cancelled" };
+      }
+      const stopReason = hooks.completedStopReason?.(response2) ?? response2.stopReason;
+      if (contextWindow !== void 0) {
+        emit({
+          type: "thread.token-usage.updated",
+          ...stamp(),
+          provider: options.provider,
+          threadId: options.threadId,
+          turnId,
+          payload: {
+            usage: {
+              usedTokens: contextWindow.usedTokens,
+              ...contextWindow.maxTokens === void 0 ? {} : { maxTokens: contextWindow.maxTokens }
+            }
+          }
+        });
+      }
+      settle2({
+        turnId,
+        stopReason,
+        state: response2.stopReason === "cancelled" ? "cancelled" : "completed"
+      });
+      return {
+        threadId: options.threadId,
+        turnId,
+        stopReason,
+        ...response2.usage !== void 0 && response2.usage !== null ? { usage: response2.usage } : {}
+      };
+    };
     await promptMutex.acquire();
     let response;
     try {
@@ -25428,6 +25514,7 @@ function createExecutorPrompt({
           expectedGeneration: started.generation
         });
       }
+      failIfDisposed();
       if (isStale()) {
         settle2({ turnId, stopReason: "cancelled", state: "cancelled" });
         return { threadId: options.threadId, turnId, stopReason: "cancelled" };
@@ -25435,10 +25522,15 @@ function createExecutorPrompt({
       closeActiveAssistantSegment(turnId);
       let written = false;
       try {
-        response = await sendPromptRpc(started.sessionId, promptParts, () => {
-          written = true;
-          input2.onDispatched?.(turnId);
-        });
+        response = await sendPromptRpc(
+          started.sessionId,
+          promptParts,
+          () => {
+            written = true;
+            input2.onDispatched?.(turnId);
+          },
+          record2
+        );
       } catch (error62) {
         if (shared.disposed) {
           throw new AcpExecutorDisposedError();
@@ -25477,8 +25569,7 @@ function createExecutorPrompt({
     if (turnId === void 0) {
       throw new AcpExecutorError("internal", "ACP prompt settled without a turn id");
     }
-    const settledTurnId = turnId;
-    let contextWindow;
+    if (record2.finished) throw new AcpExecutorDisposedError();
     if (hooks.readContextWindow !== void 0) {
       try {
         contextWindow = await hooks.readContextWindow({
@@ -25489,43 +25580,6 @@ function createExecutorPrompt({
         contextWindow = void 0;
       }
     }
-    const finishPrompt = () => {
-      if (interruptedTurnIds.has(settledTurnId)) {
-        settle2({ turnId: settledTurnId, stopReason: "cancelled", state: "cancelled" });
-        return {
-          threadId: options.threadId,
-          turnId: settledTurnId,
-          stopReason: "cancelled"
-        };
-      }
-      const stopReason = hooks.completedStopReason?.(response) ?? response.stopReason;
-      if (contextWindow !== void 0) {
-        emit({
-          type: "thread.token-usage.updated",
-          ...stamp(),
-          provider: options.provider,
-          threadId: options.threadId,
-          turnId: settledTurnId,
-          payload: {
-            usage: {
-              usedTokens: contextWindow.usedTokens,
-              ...contextWindow.maxTokens === void 0 ? {} : { maxTokens: contextWindow.maxTokens }
-            }
-          }
-        });
-      }
-      settle2({
-        turnId: settledTurnId,
-        stopReason,
-        state: response.stopReason === "cancelled" ? "cancelled" : "completed"
-      });
-      return {
-        threadId: options.threadId,
-        turnId: settledTurnId,
-        stopReason,
-        ...response.usage !== void 0 && response.usage !== null ? { usage: response.usage } : {}
-      };
-    };
     if (threadMutex.tryAcquire()) {
       try {
         return finishPrompt();
@@ -25543,6 +25597,91 @@ function createExecutorPrompt({
   return { sendPromptRpc, prompt };
 }
 
+// ../../packages/ycodium-acp-executor/src/executor/prompt-results.ts
+function createPromptResults({
+  options,
+  shared
+}) {
+  const prompts = /* @__PURE__ */ new Map();
+  const add = (identity, finish) => {
+    const { promise: done, resolve: resolve2 } = Promise.withResolvers();
+    const record2 = {
+      ...identity,
+      finish,
+      done,
+      resolve: resolve2,
+      rejected: false,
+      interrupted: false,
+      finished: false
+    };
+    prompts.set(record2.promptId, record2);
+    return record2;
+  };
+  const receive = (promptId, response) => {
+    const record2 = prompts.get(promptId);
+    if (!record2 || record2.finished || record2.rejected || record2.response !== void 0) return;
+    if (shared.disposed || shared.generation !== record2.generation || shared.sessionId !== record2.sessionId)
+      return;
+    record2.response = response;
+  };
+  const reject = (promptId) => {
+    const record2 = prompts.get(promptId);
+    if (record2 && record2.response === void 0) record2.rejected = true;
+  };
+  const stop = (turnId) => {
+    for (const record2 of prompts.values()) {
+      if (!record2.finished && (turnId === void 0 || record2.turnId === turnId) && record2.response === void 0) {
+        record2.interrupted = true;
+      }
+    }
+  };
+  const complete = (record2) => {
+    record2.finished = true;
+    record2.resolve();
+  };
+  const hasInterrupted = (turnId) => [...prompts.values()].some((record2) => record2.turnId === turnId && record2.interrupted);
+  const forget = (turnId) => {
+    for (const [id, record2] of prompts) {
+      if (record2.turnId === turnId) {
+        complete(record2);
+        prompts.delete(id);
+      }
+    }
+  };
+  const wait = async (turnId) => {
+    const claimed = [...prompts.values()].filter(
+      (record2) => !record2.finished && record2.response !== void 0 && (turnId === void 0 || record2.turnId === turnId)
+    );
+    if (claimed.length === 0) return;
+    let timer;
+    try {
+      const drained = await Promise.race([
+        Promise.all(claimed.map((record2) => record2.done)).then(() => true),
+        new Promise((resolve2) => {
+          timer = setTimeout(() => resolve2(false), options.resultDrainTimeoutMs ?? 2e3);
+        })
+      ]);
+      if (drained) return;
+      options.log?.warn?.("ACP result settlement timed out", { threadId: options.threadId });
+      for (const record2 of claimed) if (!record2.finished) record2.finish();
+    } finally {
+      clearTimeout(timer);
+    }
+  };
+  const finishUnreceived = () => {
+    const claimedTurns = new Set(
+      [...prompts.values()].filter((record2) => !record2.finished && record2.response !== void 0).map((record2) => record2.turnId)
+    );
+    for (const record2 of prompts.values()) {
+      if (!record2.finished && record2.response === void 0) {
+        if (claimedTurns.has(record2.turnId)) record2.finish();
+        else complete(record2);
+      }
+    }
+  };
+  return { add, receive, reject, stop, complete, hasInterrupted, forget, wait, finishUnreceived };
+}
+
 // ../../packages/ycodium-acp-executor/src/user-input-pending.ts
 var userInputAnswerOptionId = (question, answers) => {
   const answer = answers[question.id];
@@ -25849,7 +25988,7 @@ function createExecutorRuntime({
     turnId: () => shared.activeTurnId
   });
   const failIfDisposed = () => {
-    if (shared.disposed) {
+    if (shared.disposed || shared.disposing) {
       throw new AcpExecutorDisposedError();
     }
   };
@@ -26441,6 +26580,7 @@ function createExecutorSettlement({
   const abortPendingSettlement = (reason, failureCategory) => {
     const waiting = shared.pendingSettlement;
     if (waiting === void 0) return;
+    if (waiting.hasResult?.()) return;
     shared.pendingSettlement = void 0;
     waiting.settle({
       error: withFailureCategory(
@@ -26462,6 +26602,7 @@ function createExecutorSettlement({
     shared.pendingSettlement = void 0;
     rememberSettledPromptKey(waiting.promptKey);
     if (signal.outcome === "error") {
+      waiting.onError?.();
       waiting.settle({
         error: withFailureCategory(
           new AcpExecutorRequestError(
@@ -26472,8 +26613,10 @@ function createExecutorSettlement({
         )
       });
     } else {
+      const response = { stopReason: signal.stopReason ?? "end_turn" };
+      waiting.onResponse?.(response);
       waiting.settle({
-        response: { stopReason: signal.stopReason ?? "end_turn" }
+        response
       });
     }
     return true;
@@ -26803,6 +26946,7 @@ function createAcpExecutor(options) {
   const shared = {
     generation: 0,
     disposed: false,
+    disposing: false,
     status: "idle",
     sessionId: void 0,
     modelSelectionState: {
@@ -26890,6 +27034,7 @@ function createAcpExecutor(options) {
     shared
   });
   const { rememberSettledPromptKey, abortPendingSettlement, settleFromNotification } = createExecutorSettlement({ hooks, shared });
+  const promptResults = createPromptResults({ options, shared });
   const connection = createAcpConnection({
     readable: options.readable,
     writable: options.writable,
@@ -26900,8 +27045,12 @@ function createAcpExecutor(options) {
       });
     },
     // 窗口在应答帧到达的那一刻同步收掉：应答之后的通知是真输出，不能再丢。
-    onResponse: (method) => {
+    onResponse: ({ method, promptId }, outcome) => {
       if (method === "session/load") shared.sessionLoadInFlight = false;
+      if (promptId !== void 0) {
+        if ("result" in outcome) promptResults.receive(promptId, outcome.result);
+        else promptResults.reject(promptId);
+      }
     },
     onNotification: (notification) => {
       if (notification.method === "session/update") {
@@ -26966,6 +27115,7 @@ function createAcpExecutor(options) {
     shared
   });
   const { sendPromptRpc, prompt } = createExecutorPrompt({
+    promptResults,
     isLive,
     closeActiveAssistantSegment,
     emit,
@@ -26985,6 +27135,7 @@ function createAcpExecutor(options) {
     shared
   });
   const { cancel, compact, dispose } = createExecutorLifecycle({
+    promptResults,
     failIfDisposed,
     requireStarted,
     interruptedTurnIds,
@@ -27036,6 +27187,27 @@ function createAcpExecutor(options) {
   };
 }
 
+// ../../packages/ycodium-acp-executor/src/session-registry.ts
+function createAcpSessionRegistry(threads, stopBooked2) {
+  const requireThread = (threadId) => {
+    const booked = threads.get(threadId);
+    if (!booked) throw new Error(`unknown thread ${threadId}`);
+    if (booked.closing) throw new Error(`thread ${threadId} is closing`);
+    return booked;
+  };
+  const stopSession = (threadId, booked = threads.get(threadId)) => {
+    if (!booked) return Promise.resolve();
+    booked.closing ??= Promise.resolve().then(() => stopBooked2(booked)).then(() => {
+      if (threads.get(threadId) === booked) threads.delete(threadId);
+    });
+    return booked.closing;
+  };
+  const stopAll = () => Promise.all([...threads].map(([threadId, booked]) => stopSession(threadId, booked))).then(
+    () => void 0
+  );
+  return { requireThread, stopSession, stopAll };
+}
+
 // ../../packages/ycodium-acp-executor/src/prompt-dispatch.ts
 var dispatchAcpPrompt = (executor, input2) => {
   const { promise: dispatched, resolve: resolve2 } = Promise.withResolvers();
@@ -27565,11 +27737,8 @@ var createAcpInstance = (config2, host) => {
   const events = new EventBus();
   const threads = /* @__PURE__ */ new Map();
   let disposed = false;
-  const requireThread = (threadId) => {
-    const booked = threads.get(threadId);
-    if (!booked) throw new Error(`unknown thread ${threadId}`);
-    return booked;
-  };
+  let disposeTask;
+  const { requireThread, stopSession, stopAll } = createAcpSessionRegistry(threads, stopBooked);
   const instance = {
     probe: async () => {
       if (recipe.binaryPath.length === 0) {
@@ -27634,8 +27803,8 @@ var createAcpInstance = (config2, host) => {
       if (cwd.trim() === "") throw new Error("workspace path missing");
       const existing = threads.get(input2.threadId);
       if (existing !== void 0) {
-        await stopBooked(existing);
-        threads.delete(input2.threadId);
+        await stopSession(input2.threadId, existing);
+        if (disposed) throw new Error("instance disposed");
         throwIfStartAborted(signal);
       }
       const env = buildSpawnEnv(recipe, recipe.homePath);
@@ -27763,7 +27932,7 @@ var createAcpInstance = (config2, host) => {
     },
     interruptTurn: async (threadId, turnId) => {
       const booked = threads.get(threadId);
-      if (booked === void 0) return;
+      if (booked === void 0 || booked.closing) return;
       host.log.info("interrupt turn", { threadId, turnId });
       await booked.executor.cancel(turnId);
       await yieldTick();
@@ -27804,25 +27973,21 @@ var createAcpInstance = (config2, host) => {
         updatedAt: nowIso()
       };
     },
-    stopSession: async (threadId) => {
-      const booked = threads.get(threadId);
-      if (booked === void 0) return;
-      threads.delete(threadId);
-      await stopBooked(booked);
-    },
+    stopSession: (threadId) => stopSession(threadId),
     readThread: async (threadId) => {
       const booked = requireThread(threadId);
       return { threadId, turns: booked.turns };
     },
     events,
     continuationKey: acpContinuationKey(recipe),
-    dispose: async () => {
-      if (disposed) return;
+    dispose: () => {
+      if (disposeTask) return disposeTask;
       disposed = true;
-      const booked = [...threads.values()];
-      threads.clear();
-      await Promise.all(booked.map((entry) => stopBooked(entry)));
-      events.close();
+      disposeTask = (async () => {
+        await stopAll();
+        events.close();
+      })();
+      return disposeTask;
     }
   };
   return instance;
@@ -27840,7 +28005,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-acp",
-  apiVersion: 14,
+  apiVersion: 15,
   executors,
   activate(ctx) {
     ctx.log.info("generic ACP executor ready");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-acp",
-  "version": "0.2.3130",
+  "version": "0.2.3158",
   "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-acp-executor": "0.2.3130",
-    "@ycodium-ai/plugin-api": "0.2.3130",
-    "ycodium-executor-testing": "0.0.0"
+    "ycodium-executor-testing": "0.0.0",
+    "ycodium-acp-executor": "0.2.3158",
+    "@ycodium-ai/plugin-api": "0.2.3158"
   },
   "ycodium": {
     "plugin": "./dist/index.js",