@ycodium-ai/agent-kimi 0.2.3484 → 0.2.3506

package/dist/index.js

@@ -27676,75 +27676,11 @@ function toAcpMcpServers(entries) {
 }
 
 // ../../packages/ycodium-acp-executor/src/probe.ts
-function withProbeTimeout(promise2, timeoutMs, what) {
-  return new Promise((resolve3, reject) => {
-    const timer = setTimeout(() => {
-      reject(new Error(`${what} timed out after ${timeoutMs}ms`));
-    }, timeoutMs);
-    timer.unref?.();
-    promise2.then(
-      (value) => {
-        clearTimeout(timer);
-        resolve3(value);
-      },
-      (error62) => {
-        clearTimeout(timer);
-        reject(error62 instanceof Error ? error62 : new Error(String(error62)));
-      }
-    );
-  });
-}
 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/config.ts
 function isRecord6(value) {
@@ -28389,6 +28325,10 @@ var createKimiTokenReader = (input2) => {
 };
 
 // src/kimiModels.ts
+import {
+  runProcessOperation,
+  OperationCleanupError
+} from "@ycodium-ai/plugin-api/process-operation";
 import {
   describeExecutorSpawnFailure,
   ExecutorSpawnAbortedError,
@@ -28463,31 +28403,31 @@ function kimiProbeModels(stdout) {
 }
 async function probeKimiModels(input2) {
   const { recipe, host, env } = input2;
-  let handle;
+  let spawned = false;
   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 } : {},
-      ...input2.signal === void 0 ? {} : { signal: input2.signal }
-    });
-  } catch (error62) {
-    if (error62 instanceof ExecutorSpawnRefusedError || error62 instanceof ExecutorSpawnAbortedError) {
-      throw error62;
-    }
-    return { kind: "not-started", ...describeExecutorSpawnFailure(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"
-    });
+    const run = await runProcessOperation(
+      {
+        ...host,
+        process: {
+          spawn: async (request) => {
+            const handle = await host.process.spawn(request);
+            spawned = true;
+            return handle;
+          }
+        }
+      },
+      {
+        program: recipe.binaryPath,
+        args: KIMI_MODEL_LIST_ARGS,
+        cwd: process.cwd(),
+        owner: { bindingId: host.bindingId },
+        ...Object.keys(env).length > 0 ? { env } : {},
+        signal: input2.signal,
+        timeoutMs: input2.timeoutMs ?? PROBE_TIMEOUT_MS,
+        timeoutMessage: `kimi provider list timed out after ${input2.timeoutMs ?? PROBE_TIMEOUT_MS}ms`,
+        maxOutputBytes: MAX_OUTPUT_BYTES
+      }
+    );
     if (run.exitCode !== 0) {
       const stderr = run.stderr.trim();
       return {
@@ -28500,22 +28440,30 @@ async function probeKimiModels(input2) {
       models: run.stdout === void 0 ? void 0 : kimiProbeModels(run.stdout)
     };
   } catch (error62) {
+    if (error62 instanceof ExecutorSpawnRefusedError || error62 instanceof ExecutorSpawnAbortedError || error62 instanceof OperationCleanupError || input2.signal?.aborted)
+      throw error62;
+    if (!spawned) return { kind: "not-started", ...describeExecutorSpawnFailure(error62) };
     return { kind: "failed", detail: probeFailureDetail(error62) };
   }
 }
 async function probeKimiVersion(input2) {
   const { recipe, host, env, signal } = input2;
-  return probeCliVersion({
-    spawn: () => host.process.spawn({
+  try {
+    const run = await runProcessOperation(host, {
       program: recipe.binaryPath,
       args: ["--version"],
-      cwd: process.cwd(),
       owner: { bindingId: host.bindingId },
       ...Object.keys(env).length > 0 ? { env } : {},
-      ...signal === void 0 ? {} : { signal }
-    }),
-    timeoutMs: PROBE_TIMEOUT_MS
-  });
+      signal,
+      timeoutMs: PROBE_TIMEOUT_MS,
+      maxOutputBytes: 64 * 1024
+    });
+    if (run.exitCode !== 0) return null;
+    return parseCliVersion(run.stdout) ?? parseCliVersion(run.stderr);
+  } catch (error62) {
+    if (error62 instanceof OperationCleanupError || signal?.aborted) throw error62;
+    return null;
+  }
 }
 async function probeKimi(input2) {
   const [listed, version2] = await Promise.all([probeKimiModels(input2), probeKimiVersion(input2)]);
@@ -28763,7 +28711,12 @@ var createKimiInstance = (config2, host) => {
           };
       }
     },
-    readCliVersion: () => recipe.binaryPath.length === 0 ? Promise.resolve(null) : probeKimiVersion({ recipe, host, env: buildSpawnEnv(recipe, recipe.homePath) }),
+    readCliVersion: (signal) => recipe.binaryPath.length === 0 ? Promise.resolve(null) : probeKimiVersion({
+      recipe,
+      host,
+      env: buildSpawnEnv(recipe, recipe.homePath),
+      ...signal === void 0 ? {} : { signal }
+    }),
     // 暂不处理 input.readOnlyDirectories（有意为之）：kimi 经共享的 ycodium-acp-executor 起会话，
     // 还没用真机确认这家 CLI 对 cwd 之外的读怎么处理、要不要放行。确认之后再接这一栏。
     startSession: async (input2, signal) => {
@@ -29005,7 +28958,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-kimi",
-  apiVersion: 39,
+  apiVersion: 42,
   executors,
   activate(ctx) {
     ctx.log.info("Kimi Code executor ready");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-kimi",
-  "version": "0.2.3484",
+  "version": "0.2.3506",
   "description": "Kimi Code executor: runs `kimi acp` 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.3484",
+    "@ycodium-ai/plugin-api": "0.2.3506",
     "ycodium-executor-testing": "0.0.0",
-    "ycodium-acp-executor": "0.2.3484"
+    "ycodium-acp-executor": "0.2.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",