@ycodium-ai/agent-kimi 0.2.3681 → 0.2.3766

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();
       }
@@ -25316,23 +25325,31 @@ function createAcpConnection(options) {
 function normalizeModelId(value) {
   return value?.trim() || void 0;
 }
-function adoptReportedConfigOptions(state, configOptions) {
+function adoptReportedConfigOptions(state, configOptions, fromAgent = true) {
   const option = state.modelConfigId === void 0 ? void 0 : findConfigOptionEntry(configOptions, state.modelConfigId);
   const value = option?.["currentValue"];
   const reported = typeof value === "string" ? normalizeModelId(value) : void 0;
   if (reported === void 0) return { ...state, configOptions };
   const { modelUnconfirmed: _confirmed, ...known } = state;
-  return { ...known, configOptions, currentModelId: reported };
+  const stillReported = fromAgent || state.currentModelReported === true && reported === state.currentModelId;
+  const { currentModelReported: _stale, ...unreported } = known;
+  return {
+    ...stillReported ? known : unreported,
+    configOptions,
+    currentModelId: reported,
+    ...stillReported ? { currentModelReported: true } : {}
+  };
 }
 function forgetConfigOptionValue(state, configId) {
   const forgetsModel = configId === void 0 || configId === state.modelConfigId;
+  const { currentModelReported: _forgottenReport, ...withoutReport } = state;
   const configOptions = configId !== void 0 && Array.isArray(state.configOptions) ? state.configOptions.map((option) => {
     if (!isRecord2(option) || option["id"] !== configId) return option;
     const { currentValue: _forgotten, ...rest } = option;
     return rest;
   }) : state.configOptions;
   return {
-    ...state,
+    ...forgetsModel ? withoutReport : state,
     configOptions,
     ...forgetsModel ? { currentModelId: void 0, modelUnconfirmed: true } : {}
   };
@@ -25349,6 +25366,7 @@ function modelSelectionStateFromSetup(setup) {
     sessionModelsAdvertised: sessionModels !== void 0,
     modelConfigId,
     currentModelId,
+    ...currentModelId === void 0 ? {} : { currentModelReported: true },
     advertisedModelValues: strategy === "config-option" ? modelConfigOption === void 0 ? [] : collectSessionConfigOptionValues(modelConfigOption) : collectSessionModelIds(sessionModels),
     configOptions: setup.configOptions,
     catalogSetup: setup
@@ -25367,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() {
@@ -25568,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
             );
           })
@@ -26136,14 +26154,28 @@ function createExecutorPrompt({
     }
   };
   const alignTurnOptions = async (input2, sessionId, generation, isStale, signal) => {
+    const before = shared.modelSelectionState;
     const applied = await applyRequestedModel({
-      state: shared.modelSelectionState,
+      state: before,
       acpSessionId: sessionId,
       requestedModelId: input2.requestedModelId,
       expectedGeneration: generation,
       signal
     });
     shared.modelSelectionState = applied;
+    if (applied.currentModelId !== void 0 && (applied.currentModelId !== before.currentModelId || applied.currentModelReported !== before.currentModelReported)) {
+      emit({
+        type: "thread.metadata.updated",
+        ...stamp(),
+        provider: options.provider,
+        threadId: options.threadId,
+        ...shared.activeTurnId === void 0 ? {} : { turnId: shared.activeTurnId },
+        payload: {
+          model: applied.currentModelId,
+          modelSource: applied.currentModelReported === true ? "reported" : "echo"
+        }
+      });
+    }
     if (isStale()) return;
     const switched = applied.configOptions;
     let aligned;
@@ -26168,7 +26200,8 @@ function createExecutorPrompt({
     if (aligned.configOptions !== switched) {
       shared.modelSelectionState = adoptReportedConfigOptions(
         shared.modelSelectionState,
-        aligned.configOptions
+        aligned.configOptions,
+        false
       );
     }
     if (aligned.unsupportedEffort !== void 0) {
@@ -26400,12 +26433,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
@@ -26453,9 +26486,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
           );
         })
@@ -26615,14 +26648,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(
@@ -26840,14 +26873,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);
     });
@@ -27107,18 +27140,20 @@ function createExecutorSession({
     const base = ours !== void 0 && ours.seq > issuedAt ? ours.configOptions : configOptions;
     return { configOptions: withConfigOptionValue(base, configId, value), reported: false };
   };
-  const writeConfigOption = async (...args) => (await writeConfigOptionReported(...args)).configOptions;
   const switchModel = async (input2) => {
     let configOptions = input2.state.configOptions;
+    let fromAgent = true;
     const write = { option: "model", signal: input2.signal };
     if (input2.state.strategy === "config-option" && input2.state.modelConfigId !== void 0) {
-      configOptions = await writeConfigOption(
+      const written = await writeConfigOptionReported(
         input2.sessionId,
         configOptions,
         input2.state.modelConfigId,
         input2.value,
         write
       );
+      configOptions = written.configOptions;
+      fromAgent = written.reported;
     } else {
       const before = shared.configOptionUpdates.get(input2.sessionId);
       const pending = connection.begin("session/set_model", {
@@ -27136,7 +27171,12 @@ function createExecutorSession({
       throw new AcpExecutorDisposedError();
     }
     const { modelUnconfirmed: _confirmed, ...known } = input2.state;
-    return adoptReportedConfigOptions({ ...known, currentModelId: input2.value }, configOptions);
+    const { currentModelReported: _echoed, ...requested } = known;
+    return adoptReportedConfigOptions(
+      { ...requested, currentModelId: input2.value },
+      configOptions,
+      fromAgent
+    );
   };
   const applyRequestedModel = async (input2) => {
     const requestedModelId = normalizeModelId(input2.requestedModelId) ?? "";
@@ -27280,7 +27320,8 @@ function createExecutorSession({
       });
       nextModelSelectionState = adoptReportedConfigOptions(
         nextModelSelectionState,
-        aligned.configOptions
+        aligned.configOptions,
+        false
       );
       if (aligned.unsupportedEffort !== void 0) {
         options.log?.info("requested effort is not offered by this model; using its default", {
@@ -27313,7 +27354,8 @@ function createExecutorSession({
       initializeResult: initialized,
       sessionSetupResult: setup,
       modelConfigId: extractModelConfigId(setup),
-      modelId: nextModelSelectionState.currentModelId
+      modelId: nextModelSelectionState.currentModelId,
+      modelReported: nextModelSelectionState.currentModelReported === true
     };
     shared.startResult = result;
     shared.status = "ready";
@@ -28271,6 +28313,9 @@ function createAcpExecutor(options) {
     get modelId() {
       return shared.modelSelectionState.currentModelId;
     },
+    get modelReported() {
+      return shared.modelSelectionState.currentModelReported === true;
+    },
     get status() {
       return shared.status;
     },
@@ -28406,13 +28451,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([
@@ -29458,8 +29503,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 = [];
@@ -29486,8 +29531,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);
         });
       }
     };
@@ -29735,7 +29780,11 @@ var createKimiInstance = (config2, host) => {
           createdAt,
           updatedAt: createdAt,
           resumeCursor,
-          ...started.modelId === void 0 ? {} : { model: started.modelId },
+          ...started.modelId === void 0 ? {} : {
+            model: started.modelId,
+            // agent 在握手里报的才是读回的；切型号走 session/set_model 时回包不带型号，那只是请求值。
+            modelSource: started.modelReported ? "reported" : "echo"
+          },
           ...input2.bindingGeneration === void 0 ? {} : { bindingGeneration: input2.bindingGeneration }
         };
         registerSession(input2.threadId, {
@@ -29872,6 +29921,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);
@@ -29880,9 +29930,26 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-kimi",
-  apiVersion: 52,
+  apiVersion: 56,
   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.3681",
+  "version": "0.2.3766",
   "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.3681",
-    "ycodium-acp-executor": "0.2.3681",
-    "ycodium-executor-testing": "0.0.0"
+    "ycodium-acp-executor": "0.2.3766",
+    "ycodium-executor-testing": "0.0.0",
+    "@ycodium-ai/plugin-api": "0.2.3766"
   },
   "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": [
       {