@ycodium-ai/agent-kimi 0.2.3710 → 0.2.3799

package/dist/index.js

@@ -6,6 +6,13 @@ var __export = (target, all) => {
 
 // src/index.ts
 import { definePlugin } from "@ycodium-ai/plugin-api";
+import * as NodeOS6 from "node:os";
+import * as NodePath8 from "node:path";
+import {
+  EXECUTOR_EFFECTIVE_PAYLOAD_SCHEMA,
+  executorHomeEffectiveValue,
+  readExecutorEffectiveRequest
+} from "@ycodium-ai/plugin-api/executor";
 
 // src/card.ts
 var KIMI_DRIVER_KIND = "kimiCode";
@@ -16,6 +23,8 @@ var KIMI_CARD = {
   commandName: "kimi",
   launchArgs: "acp",
   homeEnvVar: "KIMI_CODE_HOME",
+  // 设置表单里留空的格子此刻会用什么，见 index.ts 的同名命令。
+  effectiveCommand: "effectiveConfig",
   environment: [],
   // 官方安装器装进 ~/.kimi-code（安装器的 KIMI_INSTALL_DIR 默认值）。
   install: {
@@ -310,8 +319,8 @@ var UnboundedEventStream = class {
                 iterators.subscribers.delete(subscriber);
                 return { value: void 0, done: true };
               }
-              await new Promise((resolve3) => {
-                subscriber.wake = resolve3;
+              await new Promise((resolve4) => {
+                subscriber.wake = resolve4;
               });
             }
           },
@@ -6506,7 +6515,7 @@ var recursive = /* @__PURE__ */ new WeakMap();
 var NONE = 0;
 var ASSUMED = 1;
 var PROVEN = 2;
-function isRecursive(inst, stack, resolve3) {
+function isRecursive(inst, stack, resolve4) {
   const cached2 = recursive.get(inst);
   if (cached2 !== void 0)
     return cached2 ? PROVEN : NONE;
@@ -6516,7 +6525,7 @@ function isRecursive(inst, stack, resolve3) {
   let result = NONE;
   const check2 = (child) => {
     if (result !== PROVEN && child?._zod) {
-      const answer = isRecursive(child, stack, resolve3);
+      const answer = isRecursive(child, stack, resolve4);
       if (answer > result)
         result = answer;
     }
@@ -6527,7 +6536,7 @@ function isRecursive(inst, stack, resolve3) {
       const desc = Object.getOwnPropertyDescriptor(sh, key);
       if (spread && !desc.enumerable)
         continue;
-      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve3) : NONE;
+      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve4) : NONE;
       if (child > answer)
         answer = child;
     }
@@ -6591,7 +6600,7 @@ function isRecursive(inst, stack, resolve3) {
       break;
     // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
     case "lazy": {
-      const inner = def._cachedInner ?? (resolve3 ? inst._zod.innerType : void 0);
+      const inner = def._cachedInner ?? (resolve4 ? inst._zod.innerType : void 0);
       merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
       break;
     }
@@ -23255,11 +23264,11 @@ var Connection = class {
     const id = this.nextRequestId++;
     let cancel = () => {
     };
-    const response = new Promise((resolve3, reject) => {
+    const response = new Promise((resolve4, reject) => {
       const pendingResponse = {
         resolve: (value) => {
           try {
-            resolve3(mapResponse ? mapResponse(value) : value);
+            resolve4(mapResponse ? mapResponse(value) : value);
           } catch (error62) {
             reject(error62);
           }
@@ -23316,8 +23325,8 @@ var Connection = class {
     this.stream = stream;
     this.staticHandlers = handlers;
     this.allowBatches = options?.allowBatches ?? true;
-    this.closedPromise = new Promise((resolve3) => {
-      this.abortController.signal.addEventListener("abort", () => resolve3());
+    this.closedPromise = new Promise((resolve4) => {
+      this.abortController.signal.addEventListener("abort", () => resolve4());
     });
     void this.receive();
   }
@@ -24211,8 +24220,8 @@ var AsyncQueue = class {
     if (this.failed) {
       return Promise.reject(this.failure);
     }
-    return new Promise((resolve3, reject) => {
-      this.waiters.push({ resolve: resolve3, reject });
+    return new Promise((resolve4, reject) => {
+      this.waiters.push({ resolve: resolve4, reject });
     });
   }
 };
@@ -25256,12 +25265,12 @@ function createAcpConnection(options) {
     failIfClosed();
     const id = nextRequestId;
     nextRequestId += 1;
-    const { promise: promise2, resolve: resolve3, reject } = Promise.withResolvers();
+    const { promise: promise2, resolve: resolve4, reject } = Promise.withResolvers();
     pending.set(String(id), {
       method,
       ...promptId === void 0 ? {} : { promptId },
       ...onArrival === void 0 ? {} : { onArrival },
-      resolve: resolve3,
+      resolve: resolve4,
       reject
     });
     const message = params === void 0 ? { jsonrpc: "2.0", id, method } : { jsonrpc: "2.0", id, method, params };
@@ -25290,8 +25299,8 @@ function createAcpConnection(options) {
     if (inboundBatches === 0) {
       return;
     }
-    await new Promise((resolve3) => {
-      idleWaiters.push(resolve3);
+    await new Promise((resolve4) => {
+      idleWaiters.push(resolve4);
       if (inboundBatches === 0) {
         releaseIdleWaiters();
       }
@@ -25376,8 +25385,8 @@ var Mutex = class {
       this.locked = true;
       return Promise.resolve();
     }
-    return new Promise((resolve3) => {
-      this.waiters.push(resolve3);
+    return new Promise((resolve4) => {
+      this.waiters.push(resolve4);
     });
   }
   tryAcquire() {
@@ -25577,9 +25586,9 @@ function createExecutorLifecycle({
         let timer;
         await Promise.race([
           connection.closed.catch(() => void 0),
-          new Promise((resolve3) => {
+          new Promise((resolve4) => {
             timer = setTimeout(
-              resolve3,
+              resolve4,
               options.resultDrainTimeoutMs ?? DEFAULT_RESULT_DRAIN_TIMEOUT_MS
             );
           })
@@ -26056,6 +26065,7 @@ function createExecutorPrompt({
   promptResults,
   settleToolSubagents
 }) {
+  const ownOutcomes = /* @__PURE__ */ new Map();
   const settleTurn = (input2) => {
     if (!isLive(input2.expectedGeneration) || input2.record.finished) {
       return false;
@@ -26072,14 +26082,22 @@ function createExecutorPrompt({
     }
     closeActiveAssistantSegment(input2.turnId);
     shared.promptsInFlight = Math.max(0, shared.promptsInFlight - 1);
-    if (shared.promptsInFlight !== 0 || shared.activeTurnId !== input2.turnId) return false;
+    if (shared.promptsInFlight !== 0 || shared.activeTurnId !== input2.turnId) {
+      if (input2.foldedIn !== true) ownOutcomes.set(input2.turnId, input2);
+      return false;
+    }
+    const outcome = (input2.foldedIn === true ? ownOutcomes.get(input2.turnId) : void 0) ?? input2;
+    ownOutcomes.delete(input2.turnId);
     shared.activeTurnId = void 0;
     if (shared.status !== "disposed") {
       shared.status = "ready";
     }
     const interrupted = promptResults.hasInterrupted(input2.turnId);
     settleToolSubagents(
-      toolSubagentSettlementOfTurn(interrupted ? "cancelled" : input2.state, input2.failureCategory),
+      toolSubagentSettlementOfTurn(
+        interrupted ? "cancelled" : outcome.state,
+        outcome.failureCategory
+      ),
       input2.turnId
     );
     emit({
@@ -26089,10 +26107,10 @@ function createExecutorPrompt({
       threadId: options.threadId,
       turnId: input2.turnId,
       payload: {
-        state: interrupted ? "cancelled" : input2.state,
-        stopReason: interrupted ? "cancelled" : input2.stopReason,
-        ...input2.errorMessage === void 0 ? {} : { errorMessage: input2.errorMessage },
-        ...input2.state === "failed" ? failureCategoryField(input2.failureCategory) : {}
+        state: interrupted ? "cancelled" : outcome.state,
+        stopReason: interrupted ? "cancelled" : outcome.stopReason,
+        ...outcome.errorMessage === void 0 ? {} : { errorMessage: outcome.errorMessage },
+        ...outcome.state === "failed" ? failureCategoryField(outcome.failureCategory) : {}
       }
     });
     interruptedTurnIds.delete(input2.turnId);
@@ -26117,7 +26135,7 @@ function createExecutorPrompt({
       return await promptRpc;
     } else {
       const { promise: early, resolve: settleEarly } = Promise.withResolvers();
-      shared.pendingSettlement = {
+      shared.pendingSettlements.set(promptKey, {
         promptKey,
         sessionId,
         settle: settleEarly,
@@ -26126,7 +26144,7 @@ function createExecutorPrompt({
           onError: () => promptResults.reject(record2.promptId),
           hasResult: () => record2.response !== void 0
         }
-      };
+      });
       try {
         const outcome = await Promise.race([
           promptRpc.then((value) => {
@@ -26139,7 +26157,7 @@ function createExecutorPrompt({
         if (outcome.error !== void 0) throw outcome.error;
         return outcome.response;
       } finally {
-        shared.pendingSettlement = void 0;
+        shared.pendingSettlements.delete(promptKey);
         void promptRpc.catch(() => void 0);
       }
     }
@@ -26289,7 +26307,9 @@ function createExecutorPrompt({
       settle2({
         turnId,
         stopReason,
-        state: response2.stopReason === "cancelled" ? "cancelled" : "completed"
+        state: response2.stopReason === "cancelled" ? "cancelled" : "completed",
+        // 立刻写出的插话没被打断却应答 cancelled：agent 把它并进了这一轮（grok 的 removedFromQueue）。
+        foldedIn: response2.stopReason === "cancelled" && input2.expectedActiveTurnId !== void 0 && hooks.queuesPromptsWhileRunning === true
       });
       return {
         threadId: options.threadId,
@@ -26298,7 +26318,8 @@ function createExecutorPrompt({
         ...response2.usage !== void 0 && response2.usage !== null ? { usage: response2.usage } : {}
       };
     };
-    await promptMutex.acquire();
+    const writesWhileRunning = input2.expectedActiveTurnId !== void 0 && hooks.queuesPromptsWhileRunning === true;
+    if (!writesWhileRunning) await promptMutex.acquire();
     let response;
     try {
       failIfDisposed();
@@ -26380,7 +26401,7 @@ function createExecutorPrompt({
         await options.beforeApplyResult();
       }
     } finally {
-      promptMutex.release();
+      if (!writesWhileRunning) promptMutex.release();
       notifyPromptSettled();
     }
     if (!isLive(started.generation)) {
@@ -26424,12 +26445,12 @@ function createPromptResults({
 }) {
   const prompts = /* @__PURE__ */ new Map();
   const add = (identity, finish) => {
-    const { promise: done, resolve: resolve3 } = Promise.withResolvers();
+    const { promise: done, resolve: resolve4 } = Promise.withResolvers();
     const record2 = {
       ...identity,
       finish,
       done,
-      resolve: resolve3,
+      resolve: resolve4,
       rejected: false,
       interrupted: false,
       finished: false
@@ -26477,9 +26498,9 @@ function createPromptResults({
     try {
       const drained = await Promise.race([
         Promise.all(claimed.map((record2) => record2.done)).then(() => true),
-        new Promise((resolve3) => {
+        new Promise((resolve4) => {
           timer = setTimeout(
-            () => resolve3(false),
+            () => resolve4(false),
             options.resultDrainTimeoutMs ?? DEFAULT_RESULT_DRAIN_TIMEOUT_MS
           );
         })
@@ -26639,14 +26660,14 @@ function createExecutorRequests({
       }
     }
     const requestId = randomId();
-    const outcome = await new Promise((resolve3) => {
+    const outcome = await new Promise((resolve4) => {
       const pending = {
         requestId,
         request: params,
         permissionRequest,
         turnId: shared.activeTurnId,
         settled: false,
-        resolve: resolve3
+        resolve: resolve4
       };
       approvals.add(pending);
       emit(
@@ -26864,14 +26885,14 @@ function createExecutorRuntime({
     if (!promptMutex.isLocked) {
       return true;
     }
-    return await new Promise((resolve3) => {
+    return await new Promise((resolve4) => {
       const timer = setTimeout(() => {
         shared.promptWaiters = shared.promptWaiters.filter((waiter) => waiter !== onSettle);
-        resolve3(false);
+        resolve4(false);
       }, timeoutMs);
       const onSettle = () => {
         clearTimeout(timer);
-        resolve3(true);
+        resolve4(true);
       };
       shared.promptWaiters.push(onSettle);
     });
@@ -27441,28 +27462,29 @@ function createExecutorSettlement({
     if (settledPromptKeys.length > SETTLED_PROMPT_KEY_LIMIT) settledPromptKeys.shift();
   };
   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(
-        new AcpExecutorRequestError("session/prompt", reason),
-        failureCategory
-      )
-    });
+    for (const [key, waiting] of shared.pendingSettlements) {
+      if (waiting.hasResult?.()) continue;
+      shared.pendingSettlements.delete(key);
+      waiting.settle({
+        error: withFailureCategory(
+          new AcpExecutorRequestError("session/prompt", reason),
+          failureCategory
+        )
+      });
+    }
   };
   const settleFromNotification = (method, params) => {
     const hook = hooks.promptSettlement;
-    if (hook === void 0 || shared.pendingSettlement === void 0) return false;
+    if (hook === void 0 || shared.pendingSettlements.size === 0) return false;
     const signal = hook.fromNotification(method, params);
     if (signal === void 0) return false;
-    const waiting = shared.pendingSettlement;
-    if (signal.sessionId !== waiting.sessionId) return false;
-    if (signal.promptKey !== void 0 && signal.promptKey !== waiting.promptKey) {
-      return settledPromptKeys.includes(signal.promptKey);
+    const waiting = signal.promptKey === void 0 ? [...shared.pendingSettlements.values()].find(
+      (candidate) => candidate.sessionId === signal.sessionId
+    ) : shared.pendingSettlements.get(signal.promptKey);
+    if (waiting === void 0 || waiting.sessionId !== signal.sessionId) {
+      return signal.promptKey !== void 0 && settledPromptKeys.includes(signal.promptKey);
     }
-    shared.pendingSettlement = void 0;
+    shared.pendingSettlements.delete(waiting.promptKey);
     rememberSettledPromptKey(waiting.promptKey);
     if (signal.outcome === "error") {
       waiting.onError?.();
@@ -28056,7 +28078,7 @@ function createAcpExecutor(options) {
     startInFlight: void 0,
     activeTurnId: void 0,
     promptsInFlight: 0,
-    pendingSettlement: void 0,
+    pendingSettlements: /* @__PURE__ */ new Map(),
     manualCompaction: void 0,
     assistantSegment: { nextSegmentIndex: 0 },
     modeState: void 0,
@@ -28442,13 +28464,13 @@ function acpNativeSessionProcessMatcher(program, args) {
 
 // ../../packages/ycodium-acp-executor/src/prompt-dispatch.ts
 var dispatchAcpPrompt = (executor, input2) => {
-  const { promise: dispatched, resolve: resolve3 } = Promise.withResolvers();
+  const { promise: dispatched, resolve: resolve4 } = Promise.withResolvers();
   let written = false;
   const finished = executor.prompt({
     ...input2,
     onDispatched: (turnId) => {
       written = true;
-      resolve3(turnId);
+      resolve4(turnId);
     }
   });
   return Promise.race([
@@ -29494,8 +29516,8 @@ var kimiToolSubagents = {
 // src/kimiInstance.ts
 var RESUME_SCHEMA_VERSION = 1;
 var CLIENT_INFO = { name: "ycodium-agent-kimi", version: "0.1.0" };
-var yieldTick = () => new Promise((resolve3) => {
-  setImmediate(resolve3);
+var yieldTick = () => new Promise((resolve4) => {
+  setImmediate(resolve4);
 });
 var EventBus = class {
   #queued = [];
@@ -29522,8 +29544,8 @@ var EventBus = class {
         const queued = this.#queued.shift();
         if (queued !== void 0) return Promise.resolve({ done: false, value: queued });
         if (this.#closed) return Promise.resolve({ done: true, value: void 0 });
-        return new Promise((resolve3) => {
-          this.#waiters.push(resolve3);
+        return new Promise((resolve4) => {
+          this.#waiters.push(resolve4);
         });
       }
     };
@@ -29912,6 +29934,7 @@ var createKimiInstance = (config2, host) => {
 var executors = [
   {
     card: KIMI_CARD,
+    lifecycle: [{ kind: "detect", reversible: true }],
     createInstance: async (config2, host) => {
       host.log.info("createInstance");
       return createKimiInstance(config2, host);
@@ -29920,9 +29943,26 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-kimi",
-  apiVersion: 53,
+  apiVersion: 60,
   executors,
   activate(ctx) {
+    ctx.command({
+      name: "effectiveConfig",
+      description: "Settings form: the account directory an empty path resolves to on this machine.",
+      scope: "read",
+      payloadSchema: EXECUTOR_EFFECTIVE_PAYLOAD_SCHEMA,
+      handle: async (payload) => {
+        const request = readExecutorEffectiveRequest(payload);
+        return {
+          homePath: executorHomeEffectiveValue(
+            "KIMI_CODE_HOME",
+            request,
+            process.env,
+            (value) => value === void 0 ? NodePath8.join(NodeOS6.homedir(), ".kimi-code") : NodePath8.resolve(expandHomePath(value))
+          )
+        };
+      }
+    });
     ctx.log.info("Kimi Code executor ready");
   }
 });

package/locales/en.json

@@ -1,4 +1,8 @@
 {
+  "presentation": {
+    "name": "Kimi Code",
+    "description": "Use Kimi Code in Ycodium, signed in with your Kimi account."
+  },
   "form": {
     "binaryPath": {
       "title": "Program path",
@@ -9,6 +13,11 @@
       "title": "Account directory",
       "description": "Sessions and the `kimi login` credentials live here, so providers sharing this directory can pick up each other's threads and providers with different directories cannot. Leave empty to use the CLI's default.",
       "placeholder": "e.g. ~/.kimi-code-work"
+    },
+    "effective": {
+      "provider": "{{name}} in this provider",
+      "machine": "{{name}} on this machine",
+      "default": "default"
     }
   },
   "usage": {

package/locales/zh-CN.json

@@ -1,4 +1,8 @@
 {
+  "presentation": {
+    "name": "Kimi Code",
+    "description": "在 Ycodium 里使用 Kimi Code，用你的 Kimi 账号登录。"
+  },
   "form": {
     "binaryPath": {
       "title": "程序路径",
@@ -9,6 +13,11 @@
       "title": "账号目录",
       "description": "会话和 `kimi login` 的凭据都保存在这里，因此共用同一目录的 provider 可以接手彼此的会话，目录不同的则不能。留空则使用该命令行工具的默认目录。",
       "placeholder": "例如 ~/.kimi-code-work"
+    },
+    "effective": {
+      "provider": "本 provider 的 {{name}}",
+      "machine": "本机的 {{name}}",
+      "default": "默认"
     }
   },
   "usage": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-kimi",
-  "version": "0.2.3710",
+  "version": "0.2.3799",
   "description": "Kimi Code executor: runs `kimi acp` over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -21,14 +21,16 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3710",
+    "@ycodium-ai/plugin-api": "0.2.3799",
     "ycodium-executor-testing": "0.0.0",
-    "ycodium-acp-executor": "0.2.3710"
+    "ycodium-acp-executor": "0.2.3799"
   },
   "ycodium": {
     "plugin": "./dist/index.js",
     "displayName": "Kimi Code",
-    "description": "Run Kimi Code (`kimi acp`) as a Ycodium agent, with its own sign-in and account directory.",
+    "displayNameKey": "presentation.name",
+    "description": "Use Kimi Code in Ycodium, signed in with your Kimi account.",
+    "descriptionKey": "presentation.description",
     "icon": "./assets/icon.svg",
     "permissions": [
       {