@ycodium-ai/agent-acp 0.2.3236 → 0.2.3240

package/dist/index.js

@@ -25053,6 +25053,83 @@ function createAcpConnection(options) {
   };
 }
 
+// ../../packages/ycodium-acp-executor/src/model-selection.ts
+function normalizeModelId(value) {
+  return value?.trim() || void 0;
+}
+function modelSelectionStateFromSetup(setup) {
+  const sessionModels = isRecord(setup.models) ? setup.models : void 0;
+  const modelConfigId = extractModelConfigId(setup);
+  const strategy = sessionModels === void 0 && modelConfigId !== void 0 ? "config-option" : "session/set_model";
+  const modelConfigOption = modelConfigId === void 0 ? void 0 : findSessionConfigOption(setup.configOptions, modelConfigId);
+  const configModel = modelConfigOption?.currentValue;
+  const currentModelId = strategy === "config-option" ? typeof configModel === "string" ? normalizeModelId(configModel) : void 0 : typeof sessionModels?.["currentModelId"] === "string" ? normalizeModelId(sessionModels["currentModelId"]) : void 0;
+  return {
+    strategy,
+    sessionModelsAdvertised: sessionModels !== void 0,
+    modelConfigId,
+    currentModelId,
+    advertisedModelValues: strategy === "config-option" ? modelConfigOption === void 0 ? [] : collectSessionConfigOptionValues(modelConfigOption) : collectSessionModelIds(sessionModels),
+    configOptions: setup.configOptions
+  };
+}
+
+// ../../packages/ycodium-acp-executor/src/mutex.ts
+var Mutex = class {
+  locked = false;
+  waiters = [];
+  get isLocked() {
+    return this.locked;
+  }
+  acquire() {
+    if (!this.locked) {
+      this.locked = true;
+      return Promise.resolve();
+    }
+    return new Promise((resolve2) => {
+      this.waiters.push(resolve2);
+    });
+  }
+  tryAcquire() {
+    if (this.locked) {
+      return false;
+    }
+    this.locked = true;
+    return true;
+  }
+  release() {
+    const next = this.waiters.shift();
+    if (next) {
+      next();
+      return;
+    }
+    this.locked = false;
+  }
+  async runExclusive(fn) {
+    await this.acquire();
+    try {
+      return await fn();
+    } finally {
+      this.release();
+    }
+  }
+};
+
+// ../../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
+};
+
+// ../../packages/ycodium-acp-executor/src/executor/support.ts
+var DEFAULT_RESULT_DRAIN_TIMEOUT_MS = 2e3;
+
 // ../../packages/ycodium-acp-executor/src/executor/lifecycle.ts
 function createExecutorLifecycle({
   failIfDisposed,
@@ -25195,16 +25272,30 @@ function createExecutorLifecycle({
     }
   };
   let disposing;
-  const dispose = () => {
+  const dispose = (exitCode) => {
     if (disposing) return disposing;
     shared.disposing = true;
-    promptResults.stop();
-    settleAllApprovals("cancel");
-    settleAllUserInputs();
-    abortPendingSettlement("executor disposed");
-    notifyPromptSettled();
-    shared.abortLocalPrompt?.();
     disposing = (async () => {
+      if (exitCode !== void 0) {
+        let timer;
+        await Promise.race([
+          connection.closed.catch(() => void 0),
+          new Promise((resolve2) => {
+            timer = setTimeout(
+              resolve2,
+              options.resultDrainTimeoutMs ?? DEFAULT_RESULT_DRAIN_TIMEOUT_MS
+            );
+          })
+        ]);
+        clearTimeout(timer);
+        await promptResults.wait(void 0, true);
+      }
+      promptResults.stop();
+      settleAllApprovals("cancel");
+      settleAllUserInputs();
+      abortPendingSettlement("executor disposed");
+      notifyPromptSettled();
+      shared.abortLocalPrompt?.();
       promptResults.finishUnreceived();
       await promptResults.wait();
       emit({
@@ -25212,7 +25303,10 @@ function createExecutorLifecycle({
         ...stamp(),
         provider: options.provider,
         threadId: options.threadId,
-        payload: { reason: "disposed" }
+        payload: exitCode === void 0 ? { reason: "disposed" } : {
+          reason: exitCode === null ? "process exited without an exit code" : `process exited with code ${exitCode}`,
+          exitKind: exitCode === 0 ? "graceful" : "error"
+        }
       });
       shared.disposed = true;
       shared.generation += 1;
@@ -25307,11 +25401,6 @@ var acpPromptFailureCategory = (error62, input2) => {
   return error62 instanceof AcpConnectionClosedError ? acpTransportIfEstablished(input2.sessionEstablished, input2.disposed) : void 0;
 };
 
-// ../../packages/ycodium-acp-executor/src/vendor-hooks.ts
-var defaultVendorHooks = {
-  completedStopReason: (response) => response.stopReason
-};
-
 // ../../packages/ycodium-acp-executor/src/executor/prompt.ts
 function createExecutorPrompt({
   isLive,
@@ -25417,8 +25506,12 @@ function createExecutorPrompt({
       }
     }
   };
-  const prompt = async (input2) => {
+  const failIfPromptUnavailable = () => {
     failIfDisposed();
+    if (shared.connectionClosed) throw new AcpExecutorDisposedError();
+  };
+  const prompt = async (input2) => {
+    failIfPromptUnavailable();
     const started = requireStarted();
     let record2;
     const settle2 = (rest) => settleTurn({
@@ -25430,7 +25523,7 @@ function createExecutorPrompt({
     let turnId;
     await threadMutex.acquire();
     try {
-      failIfDisposed();
+      failIfPromptUnavailable();
       turnId = selectPromptTurnId(
         input2,
         shared.promptsInFlight > 0 ? shared.activeTurnId : void 0,
@@ -25539,7 +25632,7 @@ function createExecutorPrompt({
           sessionEstablished: shared.startResult !== void 0,
           disposed: shared.disposed
         });
-        if (written && input2.onDispatched !== void 0 && !interruptedTurnIds.has(turnId)) {
+        if (!interruptedTurnIds.has(turnId)) {
           const errorMessage = error62 instanceof Error && error62.message.trim() || "ACP prompt failed";
           if (settle2({
             turnId,
@@ -25547,7 +25640,7 @@ function createExecutorPrompt({
             state: "failed",
             errorMessage,
             ...failureCategory === void 0 ? {} : { failureCategory }
-          }))
+          }) && written && input2.onDispatched !== void 0)
             options.log?.warn?.("turn failed after dispatch", {
               threadId: options.threadId,
               failure: errorMessage
@@ -25648,9 +25741,9 @@ function createPromptResults({
       }
     }
   };
-  const wait = async (turnId) => {
+  const wait = async (turnId, includeUnreceived = false) => {
     const claimed = [...prompts.values()].filter(
-      (record2) => !record2.finished && record2.response !== void 0 && (turnId === void 0 || record2.turnId === turnId)
+      (record2) => !record2.finished && (includeUnreceived || record2.response !== void 0) && (turnId === void 0 || record2.turnId === turnId)
     );
     if (claimed.length === 0) return;
     let timer;
@@ -25658,7 +25751,10 @@ function createPromptResults({
       const drained = await Promise.race([
         Promise.all(claimed.map((record2) => record2.done)).then(() => true),
         new Promise((resolve2) => {
-          timer = setTimeout(() => resolve2(false), options.resultDrainTimeoutMs ?? 2e3);
+          timer = setTimeout(
+            () => resolve2(false),
+            options.resultDrainTimeoutMs ?? DEFAULT_RESULT_DRAIN_TIMEOUT_MS
+          );
         })
       ]);
       if (drained) return;
@@ -25682,13 +25778,6 @@ function createPromptResults({
   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];
-  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/executor/requests.ts
 function createExecutorRequests({
   emit,
@@ -26252,27 +26341,6 @@ function acpInitializePayload(clientInfo, overrides) {
   };
 }
 
-// ../../packages/ycodium-acp-executor/src/model-selection.ts
-function normalizeModelId(value) {
-  return value?.trim() || void 0;
-}
-function modelSelectionStateFromSetup(setup) {
-  const sessionModels = isRecord(setup.models) ? setup.models : void 0;
-  const modelConfigId = extractModelConfigId(setup);
-  const strategy = sessionModels === void 0 && modelConfigId !== void 0 ? "config-option" : "session/set_model";
-  const modelConfigOption = modelConfigId === void 0 ? void 0 : findSessionConfigOption(setup.configOptions, modelConfigId);
-  const configModel = modelConfigOption?.currentValue;
-  const currentModelId = strategy === "config-option" ? typeof configModel === "string" ? normalizeModelId(configModel) : void 0 : typeof sessionModels?.["currentModelId"] === "string" ? normalizeModelId(sessionModels["currentModelId"]) : void 0;
-  return {
-    strategy,
-    sessionModelsAdvertised: sessionModels !== void 0,
-    modelConfigId,
-    currentModelId,
-    advertisedModelValues: strategy === "config-option" ? modelConfigOption === void 0 ? [] : collectSessionConfigOptionValues(modelConfigOption) : collectSessionModelIds(sessionModels),
-    configOptions: setup.configOptions
-  };
-}
-
 // ../../packages/ycodium-acp-executor/src/runtime-mode.ts
 function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -26869,47 +26937,6 @@ function createExecutorUpdates({
   return { emitCompactionState, handleSessionUpdate };
 }
 
-// ../../packages/ycodium-acp-executor/src/mutex.ts
-var Mutex = class {
-  locked = false;
-  waiters = [];
-  get isLocked() {
-    return this.locked;
-  }
-  acquire() {
-    if (!this.locked) {
-      this.locked = true;
-      return Promise.resolve();
-    }
-    return new Promise((resolve2) => {
-      this.waiters.push(resolve2);
-    });
-  }
-  tryAcquire() {
-    if (this.locked) {
-      return false;
-    }
-    this.locked = true;
-    return true;
-  }
-  release() {
-    const next = this.waiters.shift();
-    if (next) {
-      next();
-      return;
-    }
-    this.locked = false;
-  }
-  async runExclusive(fn) {
-    await this.acquire();
-    try {
-      return await fn();
-    } finally {
-      this.release();
-    }
-  }
-};
-
 // ../../packages/ycodium-acp-executor/src/openCommands.ts
 function readOpenToolCalls(toolCalls, turnId) {
   const running = [];
@@ -27281,10 +27308,10 @@ function createAcpExecutor(options) {
     setNativeMode,
     compact,
     openToolCalls: () => readOpenToolCalls(toolCalls, shared.activeTurnId),
-    dispose: () => {
+    dispose: (exitCode) => {
       disposeOnce ??= (async () => {
         try {
-          await disposeLifecycle();
+          await disposeLifecycle(exitCode);
         } finally {
           await protocolLogSink?.close();
         }
@@ -27295,7 +27322,8 @@ function createAcpExecutor(options) {
 }
 
 // ../../packages/ycodium-acp-executor/src/session-registry.ts
-function createAcpSessionRegistry(threads, stopBooked2) {
+function createAcpSessionRegistry(threads, stopBooked2, log) {
+  const exits = /* @__PURE__ */ new WeakMap();
   const requireThread = (threadId) => {
     const booked = threads.get(threadId);
     if (!booked) throw new Error(`unknown thread ${threadId}`);
@@ -27304,7 +27332,8 @@ function createAcpSessionRegistry(threads, stopBooked2) {
   };
   const stopSession = (threadId, booked = threads.get(threadId)) => {
     if (!booked) return Promise.resolve();
-    booked.closing ??= Promise.resolve().then(() => stopBooked2(booked)).then(() => {
+    const close = { exitCode: exits.get(booked), hasExited: () => exits.has(booked) };
+    booked.closing ??= Promise.resolve().then(() => stopBooked2(booked, close)).then(() => {
       if (threads.get(threadId) === booked) threads.delete(threadId);
     }).catch((cause) => {
       if (threads.get(threadId) === booked) delete booked.closing;
@@ -27315,7 +27344,16 @@ function createAcpSessionRegistry(threads, stopBooked2) {
   const stopAll = () => Promise.all([...threads].map(([threadId, booked]) => stopSession(threadId, booked))).then(
     () => void 0
   );
-  return { requireThread, stopSession, stopAll };
+  const registerSession = (threadId, booked) => {
+    threads.set(threadId, booked);
+    void booked.handle.exited.then(async (exitCode) => {
+      exits.set(booked, exitCode);
+      await stopSession(threadId, booked);
+    }).catch((cause) => {
+      log?.warn("ACP process exit cleanup failed", { threadId, error: String(cause) });
+    });
+  };
+  return { requireThread, registerSession, stopSession, stopAll };
 }
 
 // ../../packages/ycodium-acp-executor/src/session-cleanup.ts
@@ -27328,8 +27366,11 @@ async function cleanupAcpSession(input2) {
     failures.push(new Error(`forwarding failed: ${String(cause)}`, { cause }));
   });
   for (const [step, cleanup] of [
-    ["executor.dispose", () => input2.executor.dispose()],
-    ["stopProcess", input2.stopProcess],
+    ["executor.dispose", () => input2.executor.dispose(input2.processExit?.exitCode)],
+    [
+      "stopProcess",
+      () => input2.processExit?.hasExited() ? Promise.resolve() : input2.stopProcess()
+    ],
     ["forwarding", () => forwarding]
   ]) {
     try {
@@ -27892,11 +27933,12 @@ function acpContinuationKey(recipe) {
   const resolvedHomePath = homePath.length > 0 ? NodePath4.resolve(expandHomePath(homePath)) : "";
   return `acp:home:${recipe.binaryPath.trim()}\0${resolvedHomePath}`;
 }
-async function stopBooked(booked) {
+async function stopBooked(booked, processExit) {
   await cleanupAcpSession({
     executor: booked.executor,
     stopProcess: () => booked.handle.kill("SIGTERM"),
-    forwarding: booked.forwarding
+    forwarding: booked.forwarding,
+    processExit
   });
 }
 var createAcpInstance = (config2, host) => {
@@ -27904,7 +27946,11 @@ var createAcpInstance = (config2, host) => {
   const events = new EventBus();
   const threads = /* @__PURE__ */ new Map();
   let disposed = false;
-  const { requireThread, stopSession, stopAll } = createAcpSessionRegistry(threads, stopBooked);
+  const { requireThread, registerSession, stopSession, stopAll } = createAcpSessionRegistry(
+    threads,
+    stopBooked,
+    host.log
+  );
   const disposeOnce = createRetryableClose(async () => {
     await stopAll();
     events.close();
@@ -28056,7 +28102,7 @@ var createAcpInstance = (config2, host) => {
           ...started.modelId === void 0 ? {} : { model: started.modelId },
           ...input2.bindingGeneration === void 0 ? {} : { bindingGeneration: input2.bindingGeneration }
         };
-        threads.set(input2.threadId, {
+        registerSession(input2.threadId, {
           session,
           turns: [],
           executor,
@@ -28174,7 +28220,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-acp",
-  apiVersion: 25,
+  apiVersion: 26,
   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.3236",
+  "version": "0.2.3240",
   "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.3236",
-    "ycodium-acp-executor": "0.2.3236",
-    "ycodium-executor-testing": "0.0.0"
+    "@ycodium-ai/plugin-api": "0.2.3240",
+    "ycodium-executor-testing": "0.0.0",
+    "ycodium-acp-executor": "0.2.3240"
   },
   "ycodium": {
     "plugin": "./dist/index.js",