@ycodium-ai/agent-acp 0.2.2130 → 0.2.2143

package/dist/index.js

@@ -23633,6 +23633,7 @@ function createAcpConnection(options) {
       options.readable.off("data", onData);
       options.readable.off("end", onEnd);
       options.readable.off("error", onError);
+      options.writable.off("error", onWritableError);
       try {
         await byteWriter.close();
       } catch {
@@ -23771,8 +23772,17 @@ function createAcpConnection(options) {
       endInboundBatch();
     }
   };
+  const failInbound = (error62) => {
+    if (closedError !== void 0) return;
+    options.onInboundFailure?.(error62);
+    void shutdown(
+      new AcpConnectionClosedError(
+        `ACP inbound handling failed: ${error62 instanceof Error ? error62.message : String(error62)}`
+      )
+    );
+  };
   const enqueueInbound = (work) => {
-    inboundTail = inboundTail.then(work, work);
+    inboundTail = inboundTail.then(work).catch(failInbound);
   };
   const onData = (chunk) => {
     if (closedError !== void 0) {
@@ -23822,9 +23832,15 @@ function createAcpConnection(options) {
       );
     });
   };
+  const onWritableError = (error62) => {
+    void shutdown(
+      error62 instanceof Error ? error62 : new AcpConnectionClosedError("ACP output stream error")
+    );
+  };
   options.readable.on("data", onData);
   options.readable.on("end", onEnd);
   options.readable.on("error", onError);
+  options.writable.once("error", onWritableError);
   const request = (async (method, params) => {
     failIfClosed();
     const id = nextRequestId;
@@ -23833,7 +23849,7 @@ function createAcpConnection(options) {
     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 writeMessage(message);
+      await Promise.race([writeMessage(message), promise2]);
     } catch (error62) {
       if (pending.delete(String(id))) {
         reject(error62);
@@ -25691,6 +25707,12 @@ function createAcpExecutor(options) {
   const connection = createAcpConnection({
     readable: options.readable,
     writable: options.writable,
+    onInboundFailure: (error62) => {
+      options.log?.warn?.("acp connection closed: an inbound request could not be answered", {
+        threadId: options.threadId,
+        error: error62 instanceof Error ? error62.message : String(error62)
+      });
+    },
     onNotification: (notification) => {
       if (notification.method === "session/update") {
         handleSessionUpdate(notification.params);
@@ -26328,10 +26350,10 @@ function createAcpExecutor(options) {
 }
 
 // ../../packages/ycodium-acp-executor/src/probe.ts
-function withProbeTimeout(promise2, timeoutMs, method) {
+function withProbeTimeout(promise2, timeoutMs, what) {
   return new Promise((resolve2, reject) => {
     const timer = setTimeout(() => {
-      reject(new Error(`ACP probe request '${method}' timed out after ${timeoutMs}ms`));
+      reject(new Error(`${what} timed out after ${timeoutMs}ms`));
     }, timeoutMs);
     timer.unref?.();
     promise2.then(
@@ -26356,11 +26378,15 @@ async function openAcpProbeHandshake(input2) {
     const initializeResult = await withProbeTimeout(
       connection.request("initialize", acpInitializePayload(input2.clientInfo)),
       input2.requestTimeoutMs,
-      "initialize"
+      "ACP probe request 'initialize'"
     );
     return {
       initializeResult,
-      request: (method, params) => withProbeTimeout(connection.request(method, params), input2.requestTimeoutMs, method),
+      request: (method, params) => withProbeTimeout(
+        connection.request(method, params),
+        input2.requestTimeoutMs,
+        `ACP probe request '${method}'`
+      ),
       close: () => connection.close()
     };
   } catch (error62) {
@@ -26368,6 +26394,62 @@ async function openAcpProbeHandshake(input2) {
     throw error62;
   }
 }
+function acpAgentVersion(initializeResult) {
+  if (!isRecord5(initializeResult)) return null;
+  const agentInfo = initializeResult["agentInfo"];
+  return isRecord5(agentInfo) ? asTrimmedString(agentInfo["version"]) ?? null : null;
+}
+var CLI_VERSION_PATTERN = /(?<![\d.])(\d+\.\d+\.\d+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?)/;
+function parseCliVersion(output2) {
+  return CLI_VERSION_PATTERN.exec(output2)?.[1] ?? null;
+}
+async function collectCappedText(stream, maxBytes) {
+  const decoder = new TextDecoder();
+  let text = "";
+  let total = 0;
+  for await (const chunk of stream) {
+    total += chunk.byteLength;
+    if (total <= maxBytes) text += decoder.decode(chunk, { stream: true });
+  }
+  return { text: text + decoder.decode(), overflowed: total > maxBytes };
+}
+async function collectProbeProcess(child, input2) {
+  try {
+    await child.closeStdin().catch(() => void 0);
+    const [stdout, stderr, exitCode] = await withProbeTimeout(
+      Promise.all([
+        collectCappedText(child.stdout, input2.maxOutputBytes),
+        collectCappedText(child.stderr, input2.maxOutputBytes),
+        child.exited
+      ]),
+      input2.timeoutMs,
+      input2.what
+    );
+    return { stdout: stdout.overflowed ? void 0 : stdout.text, stderr: stderr.text, exitCode };
+  } finally {
+    await child.kill("SIGTERM").catch(() => void 0);
+  }
+}
+var MAX_VERSION_OUTPUT_BYTES = 64 * 1024;
+async function probeCliVersion(input2) {
+  let child;
+  try {
+    child = await input2.spawn();
+  } catch {
+    return null;
+  }
+  try {
+    const run = await collectProbeProcess(child, {
+      timeoutMs: input2.timeoutMs,
+      maxOutputBytes: MAX_VERSION_OUTPUT_BYTES,
+      what: "--version"
+    });
+    if (run.exitCode !== 0) return null;
+    return parseCliVersion(run.stdout ?? "") ?? parseCliVersion(run.stderr);
+  } catch {
+    return null;
+  }
+}
 
 // src/card.ts
 var ACP_DRIVER_KIND = "acp";
@@ -26668,118 +26750,17 @@ function readKimiContextWindow(input2) {
 }
 
 // src/kimiModels.ts
-var PROBE_TIMEOUT_MS = 15e3;
-var MAX_OUTPUT_BYTES = 1024 * 1024;
-var KIMI_MODEL_LIST_ARGS = ["provider", "list", "--json"];
-function isRecord8(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function asString3(value) {
-  return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
-}
-function positiveInt2(value) {
-  return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.trunc(value) : void 0;
-}
-function kimiProbeModels(stdout) {
-  let parsed;
-  try {
-    parsed = JSON.parse(stdout);
-  } catch {
-    return void 0;
-  }
-  if (!isRecord8(parsed)) return void 0;
-  const models = parsed["models"];
-  if (!isRecord8(models)) return void 0;
-  const out = [];
-  for (const [slug, entry] of Object.entries(models)) {
-    const trimmed = slug.trim();
-    if (trimmed.length === 0 || !isRecord8(entry)) continue;
-    const name = asString3(entry["displayName"]);
-    const contextWindow = positiveInt2(entry["maxContextSize"]);
-    out.push({
-      slug: trimmed,
-      ...name === void 0 ? {} : { name },
-      ...contextWindow === void 0 ? {} : { contextWindow }
-    });
-  }
-  return out;
-}
-function withProbeTimeout2(promise2, what) {
-  return new Promise((resolve2, reject) => {
-    const timer = setTimeout(
-      () => reject(new Error(`${what} timed out after ${PROBE_TIMEOUT_MS}ms`)),
-      PROBE_TIMEOUT_MS
-    );
-    timer.unref?.();
-    promise2.then(
-      (value) => {
-        clearTimeout(timer);
-        resolve2(value);
-      },
-      (error62) => {
-        clearTimeout(timer);
-        reject(error62 instanceof Error ? error62 : new Error(String(error62)));
-      }
-    );
-  });
-}
-function concat(chunks) {
-  const total = chunks.reduce((sum, chunk) => sum + chunk.byteLength, 0);
-  const out = new Uint8Array(total);
-  let offset = 0;
-  for (const chunk of chunks) {
-    out.set(chunk, offset);
-    offset += chunk.byteLength;
-  }
-  return out;
-}
-async function probeKimiModels(input2) {
-  const { recipe, host, env } = input2;
-  if (recipe.binaryPath.length === 0) return void 0;
-  let handle;
-  try {
-    handle = await host.process.spawn({
-      program: recipe.binaryPath,
-      // 实例信封里的启动参数（Kimi 那行预填 `acp`）在这一栏用不上：读配置要换成
-      // `provider list --json`，留着 `acp` 就等于让它起 ACP 服务然后什么都不问。
-      args: KIMI_MODEL_LIST_ARGS,
-      cwd: process.cwd(),
-      owner: { bindingId: host.bindingId },
-      ...Object.keys(env).length > 0 ? { env } : {}
-    });
-    const spawned = handle;
-    const collect = withProbeTimeout2(
-      (async () => {
-        const chunks = [];
-        let total = 0;
-        for await (const chunk of spawned.stdout) {
-          total += chunk.byteLength;
-          if (total > MAX_OUTPUT_BYTES) return void 0;
-          chunks.push(chunk);
-        }
-        return new TextDecoder().decode(concat(chunks));
-      })(),
-      "kimi provider list"
-    );
-    const drain = (async () => {
-      for await (const _chunk of spawned.stderr) {
-      }
-    })().catch(() => void 0);
-    const [stdout, , exitCode] = await Promise.all([collect, drain, spawned.exited]);
-    if (stdout === void 0) return void 0;
-    if (exitCode !== 0) return void 0;
-    return kimiProbeModels(stdout);
-  } catch {
-    return void 0;
-  } finally {
-    await handle?.kill("SIGTERM").catch(() => void 0);
-  }
-}
+import {
+  ExecutorSpawnRefusedError as ExecutorSpawnRefusedError2
+} from "@ycodium-ai/plugin-api/executor";
 
 // src/probeModels.ts
 import * as NodeFS2 from "node:fs";
 import * as NodeOS from "node:os";
 import * as NodePath2 from "node:path";
+import {
+  ExecutorSpawnRefusedError
+} from "@ycodium-ai/plugin-api/executor";
 import { nodeStreamsFromHandle } from "@ycodium-ai/plugin-api/process-stdin";
 var PROBE_REQUEST_TIMEOUT_MS = 15e3;
 var CLIENT_INFO = { name: "ycodium-agent-acp-probe", version: "0.2.0" };
@@ -26788,18 +26769,18 @@ function acpProbeSessionCwd(instanceId) {
   const safe = instanceId.replace(/[^a-zA-Z0-9_-]/g, "_");
   return NodePath2.join(NodeOS.tmpdir(), `ycodium-acp-probe-${safe}`);
 }
-function isRecord9(value) {
+function isRecord8(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function asString4(value) {
+function asString3(value) {
   return typeof value === "string" ? value : void 0;
 }
 function findAcpProbeSessionId(listed, probeCwd) {
-  if (!isRecord9(listed) || !Array.isArray(listed["sessions"])) return void 0;
+  if (!isRecord8(listed) || !Array.isArray(listed["sessions"])) return void 0;
   for (const entry of listed["sessions"]) {
-    if (!isRecord9(entry)) continue;
-    if (asString4(entry["cwd"]) !== probeCwd) continue;
-    const sessionId = asString4(entry["sessionId"]);
+    if (!isRecord8(entry)) continue;
+    if (asString3(entry["cwd"]) !== probeCwd) continue;
+    const sessionId = asString3(entry["sessionId"]);
     if (sessionId !== void 0) return sessionId;
   }
   return void 0;
@@ -26814,7 +26795,7 @@ async function probeSessionSetup(handshake, probeCwd) {
   return handshake.request("session/new", { cwd: probeCwd, mcpServers: [] });
 }
 function acpProbeModels(setup) {
-  if (!isRecord9(setup)) return void 0;
+  if (!isRecord8(setup)) return void 0;
   const rawOptions = setup["configOptions"];
   const choices = acpModelChoicesFromConfigOptions(rawOptions) ?? acpModelChoicesFromSessionModels(setup["models"]);
   if (choices === void 0 || choices.length === 0) return void 0;
@@ -26842,14 +26823,16 @@ function acpProbeModels(setup) {
   };
   return models.map((model) => ({ ...model, capabilities }));
 }
-var failureDetail = (error62) => (error62 instanceof Error ? error62.message : String(error62)).trim() || void 0;
+var probeFailureDetail = (error62) => (error62 instanceof Error ? error62.message : String(error62)).trim() || void 0;
+var ACP_AUTH_REQUIRED_CODE = RequestError.authRequired().code;
+var isAcpAuthRequired = (error62) => error62 instanceof RequestError && error62.code === ACP_AUTH_REQUIRED_CODE;
 async function probeAcpModelsViaSession(input2) {
   const { recipe, host, env } = input2;
   const probeCwd = acpProbeSessionCwd(host.instanceId);
   try {
     NodeFS2.mkdirSync(probeCwd, { recursive: true });
   } catch (error62) {
-    return { kind: "failed", detail: failureDetail(error62) };
+    return { kind: "failed", detail: probeFailureDetail(error62), version: null };
   }
   let handle;
   try {
@@ -26861,7 +26844,8 @@ async function probeAcpModelsViaSession(input2) {
       ...Object.keys(env).length > 0 ? { env } : {}
     });
   } catch (error62) {
-    return { kind: "not-started", detail: failureDetail(error62) };
+    if (error62 instanceof ExecutorSpawnRefusedError) throw error62;
+    return { kind: "not-started", detail: probeFailureDetail(error62) };
   }
   let handshake;
   try {
@@ -26875,6 +26859,7 @@ async function probeAcpModelsViaSession(input2) {
     const setup = await probeSessionSetup(handshake, probeCwd);
     return {
       kind: "answered",
+      version: acpAgentVersion(handshake.initializeResult),
       models: acpProbeModels(setup),
       // 审批档原样上报：宿主落进 provider 快照的 `nativeModes`，composer 直接画这只手
       // 自己的那几档，不再退回宿主四档开关。
@@ -26886,13 +26871,124 @@ async function probeAcpModelsViaSession(input2) {
       currentNativeModeId: acpCurrentModeId(setup)
     };
   } catch (error62) {
-    return { kind: "failed", detail: failureDetail(error62) };
+    const version2 = acpAgentVersion(handshake?.initializeResult);
+    if (handshake !== void 0 && isAcpAuthRequired(error62)) {
+      return { kind: "auth-required", version: version2 };
+    }
+    return { kind: "failed", detail: probeFailureDetail(error62), version: version2 };
   } finally {
     await handshake?.close().catch(() => void 0);
     await handle.kill("SIGTERM").catch(() => void 0);
   }
 }
 
+// src/kimiModels.ts
+var PROBE_TIMEOUT_MS = 15e3;
+var MAX_OUTPUT_BYTES = 1024 * 1024;
+var KIMI_MODEL_LIST_ARGS = ["provider", "list", "--json"];
+function isRecord9(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function asString4(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
+}
+function positiveInt2(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.trunc(value) : void 0;
+}
+function kimiProbeModels(stdout) {
+  let parsed;
+  try {
+    parsed = JSON.parse(stdout);
+  } catch {
+    return void 0;
+  }
+  if (!isRecord9(parsed)) return void 0;
+  const models = parsed["models"];
+  if (!isRecord9(models)) return void 0;
+  const out = [];
+  for (const [slug, entry] of Object.entries(models)) {
+    const trimmed = slug.trim();
+    if (trimmed.length === 0 || !isRecord9(entry)) continue;
+    const name = asString4(entry["displayName"]);
+    const contextWindow = positiveInt2(entry["maxContextSize"]);
+    out.push({
+      slug: trimmed,
+      ...name === void 0 ? {} : { name },
+      ...contextWindow === void 0 ? {} : { contextWindow }
+    });
+  }
+  return out;
+}
+async function probeKimiModels(input2) {
+  const { recipe, host, env } = input2;
+  let handle;
+  try {
+    handle = await host.process.spawn({
+      program: recipe.binaryPath,
+      // 实例信封里的启动参数（Kimi 那行预填 `acp`）在这一栏用不上：读配置要换成
+      // `provider list --json`，留着 `acp` 就等于让它起 ACP 服务然后什么都不问。
+      args: KIMI_MODEL_LIST_ARGS,
+      cwd: process.cwd(),
+      owner: { bindingId: host.bindingId },
+      ...Object.keys(env).length > 0 ? { env } : {}
+    });
+  } catch (error62) {
+    if (error62 instanceof ExecutorSpawnRefusedError2) throw error62;
+    return { kind: "not-started", detail: probeFailureDetail(error62) };
+  }
+  try {
+    const run = await collectProbeProcess(handle, {
+      timeoutMs: input2.timeoutMs ?? PROBE_TIMEOUT_MS,
+      // 这份 JSON 实测 1.7KB；封顶是防 CLI 抽风刷日志把内存吃掉。
+      maxOutputBytes: MAX_OUTPUT_BYTES,
+      what: "kimi provider list"
+    });
+    if (run.exitCode !== 0) {
+      const stderr = run.stderr.trim();
+      return {
+        kind: "failed",
+        detail: stderr.length > 0 ? stderr : run.exitCode === null ? "kimi provider list was killed by a signal" : `kimi provider list exited with code ${run.exitCode}`
+      };
+    }
+    return {
+      kind: "answered",
+      models: run.stdout === void 0 ? void 0 : kimiProbeModels(run.stdout)
+    };
+  } catch (error62) {
+    return { kind: "failed", detail: probeFailureDetail(error62) };
+  }
+}
+async function probeKimiVersion(input2) {
+  const { recipe, host, env } = input2;
+  return probeCliVersion({
+    spawn: () => host.process.spawn({
+      program: recipe.binaryPath,
+      args: ["--version"],
+      cwd: process.cwd(),
+      owner: { bindingId: host.bindingId },
+      ...Object.keys(env).length > 0 ? { env } : {}
+    }),
+    timeoutMs: PROBE_TIMEOUT_MS
+  });
+}
+async function probeKimi(input2) {
+  const [listed, version2] = await Promise.all([probeKimiModels(input2), probeKimiVersion(input2)]);
+  switch (listed.kind) {
+    case "not-started":
+      return { kind: "not-started", detail: listed.detail };
+    case "failed":
+      return { kind: "failed", detail: listed.detail, version: version2 };
+    case "answered":
+      return {
+        kind: "answered",
+        version: version2,
+        models: listed.models,
+        nativeModes: [],
+        currentNativeModeId: void 0
+      };
+  }
+}
+
 // src/runtimeModeApproval.ts
 function acpRuntimeModeAutoApproves(runtimeMode, toolKind) {
   switch (runtimeMode) {
@@ -27028,34 +27124,46 @@ var createAcpInstance = (config2, host) => {
           detail: "ACP program path is not configured"
         };
       }
-      const outcome = isKimiInstance(recipe) ? {
-        kind: "answered",
-        models: await probeKimiModels({
-          recipe,
-          host,
-          env: buildSpawnEnv(recipe, recipe.homePath)
-        }),
-        nativeModes: void 0,
-        currentNativeModeId: void 0
-      } : await probeAcpModelsViaSession({
-        recipe,
-        host,
-        env: buildSpawnEnv(recipe, recipe.homePath)
-      });
-      const models = outcome.kind === "answered" ? outcome.models : void 0;
-      const nativeModes = outcome.kind === "answered" && outcome.nativeModes !== void 0 ? outcome.nativeModes : void 0;
-      const currentNativeModeId = outcome.kind === "answered" ? outcome.currentNativeModeId : void 0;
-      return {
-        installed: true,
-        version: null,
-        readiness: "unchecked",
-        auth: { status: "unknown" },
-        ...models === void 0 ? {} : { models },
-        ...nativeModes === void 0 || nativeModes.length === 0 ? {} : {
-          nativeModes,
-          ...currentNativeModeId === void 0 ? {} : { currentNativeModeId }
-        }
-      };
+      const env = buildSpawnEnv(recipe, recipe.homePath);
+      const outcome = isKimiInstance(recipe) ? await probeKimi({ recipe, host, env }) : await probeAcpModelsViaSession({ recipe, host, env });
+      switch (outcome.kind) {
+        case "not-started":
+          return {
+            installed: false,
+            version: null,
+            readiness: "error",
+            auth: { status: "unknown" },
+            ...outcome.detail === void 0 ? {} : { detail: outcome.detail }
+          };
+        case "failed":
+          return {
+            installed: true,
+            version: outcome.version,
+            readiness: "error",
+            auth: { status: "unknown" },
+            ...outcome.detail === void 0 ? {} : { detail: outcome.detail }
+          };
+        case "auth-required":
+          return {
+            installed: true,
+            version: outcome.version,
+            readiness: "ready",
+            auth: { status: "unauthenticated" }
+          };
+        case "answered":
+          return {
+            installed: true,
+            version: outcome.version,
+            readiness: "ready",
+            auth: { status: "unknown" },
+            ...outcome.models === void 0 ? {} : { models: outcome.models },
+            // 清单与当前档必须同进同出：只报清单，界面在清单里找不到当前档会整个不画那一格。
+            ...outcome.nativeModes.length === 0 ? {} : {
+              nativeModes: outcome.nativeModes,
+              ...outcome.currentNativeModeId === void 0 ? {} : { currentNativeModeId: outcome.currentNativeModeId }
+            }
+          };
+      }
     },
     startSession: async (input2, signal) => {
       if (disposed) throw new Error("instance disposed");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-acp",
-  "version": "0.2.2130",
+  "version": "0.2.2143",
   "description": "Generic ACP executor: user-supplied CLI over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -20,7 +20,7 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.2130",
+    "@ycodium-ai/plugin-api": "0.2.2143",
     "ycodium-acp-executor": "0.0.0",
     "ycodium-acp-protocol": "0.0.0"
   },