@ycodium-ai/agent-claude 0.2.3681 → 0.2.3766

package/dist/index.js

@@ -1,5 +1,12 @@
 // src/index.ts
+import * as NodePath20 from "node:path";
 import { definePlugin } from "@ycodium-ai/plugin-api";
+import {
+  EXECUTOR_EFFECTIVE_PAYLOAD_SCHEMA,
+  executorEnvironmentValue,
+  executorHomeEffectiveValue,
+  readExecutorEffectiveRequest
+} from "@ycodium-ai/plugin-api/executor";
 
 // src/card.ts
 var CLAUDE_DRIVER_KIND = "claudeAgent";
@@ -13,6 +20,8 @@ var CLAUDE_CARD = {
   launchArgs: "",
   // Claude 的隔离走 CLAUDE_CONFIG_DIR，不注入 HOME（钥匙串查找跟着 HOME）。
   homeEnvVar: "",
+  // 设置表单里留空的格子此刻会用什么，见 index.ts 的同名命令。
+  effectiveCommand: "effectiveConfig",
   // 写的是凭据目录（`credentialsPath`），不是共用工作目录：写错字段等于把两个账号的会话历史
   // 也分开，同一 thread 里就换不了账号了。
   accountDirectory: {
@@ -279,8 +288,8 @@ var waitForJsonlHistory = (input) => {
             signal.throwIfAborted();
             if (error !== void 0) throw error;
             if (!dirty)
-              await new Promise((resolve5) => {
-                wake = resolve5;
+              await new Promise((resolve6) => {
+                wake = resolve6;
               });
             signal.throwIfAborted();
             dirty = false;
@@ -1349,8 +1358,8 @@ async function openJsonlHistory(path, layout, signal) {
           readSignal.throwIfAborted();
           if (failure !== void 0) throw failure;
           if (!dirty)
-            await new Promise((resolve5) => {
-              wake = resolve5;
+            await new Promise((resolve6) => {
+              wake = resolve6;
             });
           readSignal.throwIfAborted();
           dirty = false;
@@ -23252,9 +23261,9 @@ var PromptQueue = class {
     const queued = this.#queued.shift();
     if (queued !== void 0) return Promise.resolve(queued);
     if (this.#closed) return Promise.resolve(void 0);
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       this.#waiters.push((result) => {
-        resolve5(result.done ? void 0 : result.value);
+        resolve6(result.done ? void 0 : result.value);
       });
     });
   }
@@ -24352,12 +24361,12 @@ function makeClaudeProcessSpawner(host, stderr, config = {}) {
 // src/sdkRead.ts
 var silentPrompt = (signal) => ({
   [Symbol.asyncIterator]: () => ({
-    next: () => new Promise((resolve5) => {
+    next: () => new Promise((resolve6) => {
       if (signal.aborted) {
-        resolve5({ done: true, value: void 0 });
+        resolve6({ done: true, value: void 0 });
         return;
       }
-      signal.addEventListener("abort", () => resolve5({ done: true, value: void 0 }), {
+      signal.addEventListener("abort", () => resolve6({ done: true, value: void 0 }), {
         once: true
       });
     }),
@@ -25808,7 +25817,7 @@ var makeSessionControls = (deps) => {
         context.query.interrupt().then(() => settled.promise).then(() => {
           acknowledged = true;
         }),
-        new Promise((resolve5) => setTimeout(resolve5, CLAUDE_INTERRUPT_GRACE_MS))
+        new Promise((resolve6) => setTimeout(resolve6, CLAUDE_INTERRUPT_GRACE_MS))
       ]);
     } catch (cause) {
       throw toRequestError(threadId, "turn/interrupt", cause);
@@ -25940,8 +25949,8 @@ var makeSessionLifecycle = (deps) => {
     const claim = context.turnState?.resultClaim;
     if (claim === void 0) return;
     let timer;
-    const timeout = new Promise((resolve5) => {
-      timer = setTimeout(() => resolve5("timeout"), RESULT_CLAIM_WAIT_MS);
+    const timeout = new Promise((resolve6) => {
+      timer = setTimeout(() => resolve6("timeout"), RESULT_CLAIM_WAIT_MS);
     });
     try {
       const outcome = await Promise.race([claim.then(() => "settled"), timeout]);
@@ -26020,7 +26029,7 @@ var makeSessionLifecycle = (deps) => {
       if (streamFiber) {
         await Promise.race([
           streamFiber.catch(() => void 0),
-          new Promise((resolve5) => setTimeout(resolve5, 1e3))
+          new Promise((resolve6) => setTimeout(resolve6, 1e3))
         ]);
       }
       const updatedAt = nowIso();
@@ -26316,8 +26325,8 @@ var makeStartSession = (deps) => {
       try {
         return await Promise.race([
           contextDeferred.promise,
-          new Promise((resolve5) => {
-            timer = setTimeout(() => resolve5(void 0), CLAUDE_SESSION_CONTEXT_WAIT_MS);
+          new Promise((resolve6) => {
+            timer = setTimeout(() => resolve6(void 0), CLAUDE_SESSION_CONTEXT_WAIT_MS);
           })
         ]);
       } catch {
@@ -26916,10 +26925,35 @@ var claudeSlashCommandsFromSdk = (commands) => Array.isArray(commands) ? command
   ];
 }) : [];
 
+// src/adapter/reportedModel.ts
+var makeReportedModelEmitter = (emitter) => {
+  const { eventHeader, offerRuntimeEvent } = emitter;
+  return (context, model) => {
+    const turn = context.turnState;
+    if (turn === void 0 || typeof model !== "string") return;
+    const reported = model.replace(/\[[^\]]*\]\s*$/, "").trim();
+    if (reported.length === 0) return;
+    const key = `${turn.turnId}|${reported}`;
+    if ((context.reportedModelKeys ??= /* @__PURE__ */ new Set()).has(key)) return;
+    context.reportedModelKeys.add(key);
+    offerRuntimeEvent(context, {
+      type: "thread.metadata.updated",
+      ...eventHeader(context, {
+        eventId: `${turn.turnId}:model:${reported}`,
+        createdAt: turn.startedAt
+      }),
+      turnId: asCanonicalTurnId(turn.turnId),
+      payload: { model: reported, modelSource: "reported" },
+      providerRefs: {}
+    });
+  };
+};
+
 // src/adapter/systemMessages.ts
 var makeSystemMessageHandler = (deps) => {
   const { emitter, host, emitRuntimeError, emitRuntimeWarning, emitThreadTokenUsage } = deps;
   const { randomUUIDv4, makeEventStamp, eventHeader, offerRuntimeEvent } = emitter;
+  const emitReportedModel = makeReportedModelEmitter(emitter);
   const emitWorkflowMemberProgress = async (context, base, message) => {
     const progress = parseWorkflowProgress(
       message.workflow_progress
@@ -27030,6 +27064,7 @@ var makeSystemMessageHandler = (deps) => {
             config: message
           }
         });
+        emitReportedModel(context, message.model);
         const threadId = context.session.threadId;
         const names = claudeSlashCommandsFromNames(message.slash_commands);
         if (names.length > 0) host.reportSessionInventory?.({ threadId, slashCommands: names });
@@ -27675,6 +27710,7 @@ var makeTurnMessageHandlers = (deps) => {
     backfillAssistantTextBlocksFromSnapshot
   } = deps;
   const { makeEventStamp, eventHeader, offerRuntimeEvent } = emitter;
+  const emitReportedModel = makeReportedModelEmitter(emitter);
   const handleUserMessage = async (context, message) => {
     if (message.type !== "user") {
       return;
@@ -27869,6 +27905,7 @@ var makeTurnMessageHandlers = (deps) => {
       return;
     }
     await ensureSyntheticTurn(context);
+    emitReportedModel(context, message.message?.model);
     const content = message.message?.content;
     if (Array.isArray(content)) {
       for (const block of content) {
@@ -28000,8 +28037,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((resolve5) => {
-          this.#waiters.push(resolve5);
+        return new Promise((resolve6) => {
+          this.#waiters.push(resolve6);
         });
       }
     };
@@ -29628,14 +29665,56 @@ var executors = [
     createInstance: async (config, host) => {
       host.log.info("createInstance");
       return createClaudeInstance(config, host, capturedAttachments, void 0, capturedCache);
-    }
+    },
+    // 厂商脚本装，宿主卸不了；登录要在那台机器的终端里跑 `claude auth login`，宿主只回这条命令。
+    lifecycle: [
+      { kind: "install", reversible: false },
+      { kind: "detect", reversible: true },
+      { kind: "sign-in", reversible: false },
+      { kind: "update", reversible: false }
+    ]
   }
 ];
 var index_default = definePlugin({
   id: "agent-claude",
-  apiVersion: 52,
+  apiVersion: 56,
   executors,
   activate(ctx) {
+    ctx.command({
+      name: "effectiveConfig",
+      description: "Settings form: the config and credentials directories empty fields resolve to.",
+      scope: "read",
+      payloadSchema: EXECUTOR_EFFECTIVE_PAYLOAD_SCHEMA,
+      handle: async (payload) => {
+        const request = readExecutorEffectiveRequest(payload);
+        const home = executorHomeEffectiveValue(
+          "CLAUDE_CONFIG_DIR",
+          request,
+          process.env,
+          (value) => resolveClaudeConfigDirPath("", value === void 0 ? {} : { CLAUDE_CONFIG_DIR: value })
+        );
+        const credentialsVariable = "CLAUDE_SECURESTORAGE_CONFIG_DIR";
+        const configuredHome = typeof request.config["homePath"] === "string" ? request.config["homePath"] : "";
+        const configVariable = executorEnvironmentValue("CLAUDE_CONFIG_DIR", request, process.env);
+        const configDirectory = resolveClaudeConfigDirPath(
+          configuredHome,
+          configVariable === null ? {} : { CLAUDE_CONFIG_DIR: configVariable.value }
+        );
+        const keychain = (
+          // eslint-disable-next-line ycodium/no-global-process-runtime -- 钥匙串只在 macOS 上用。
+          process.platform === "darwin" && configuredHome.trim() === "" && configVariable === null
+        );
+        return {
+          homePath: home,
+          credentialsPath: executorEnvironmentValue(credentialsVariable, request, process.env) !== null ? executorHomeEffectiveValue(
+            credentialsVariable,
+            request,
+            process.env,
+            (value) => NodePath20.resolve(value ?? "")
+          ) : keychain ? { detailKey: "form.credentialsPath.keychain" } : { value: configDirectory, detailKey: "form.credentialsPath.sameAsHome" }
+        };
+      }
+    });
     capturedAttachments = ctx.attachments;
     capturedCache = ctx.cache;
     ctx.log.info("claude executor ready");

package/locales/en.json

@@ -1,4 +1,8 @@
 {
+  "presentation": {
+    "name": "Claude Code",
+    "description": "Use Claude Code in Ycodium, switching models mid-session."
+  },
   "form": {
     "binaryPath": {
       "title": "Program path",
@@ -13,17 +17,24 @@
     "credentialsPath": {
       "title": "Credentials directory",
       "description": "Account-specific login directory. Keeps credentials separate while sharing the config directory.",
-      "placeholder": "~/.claude-personal"
+      "placeholder": "~/.claude-personal",
+      "sameAsHome": "same as the config directory",
+      "keychain": "macOS Keychain"
     },
     "autoCompactWindow": {
       "title": "Auto-compact after",
       "description": "Compact after 100,000 to 1,000,000 tokens. Leave empty to use Claude's default.",
-      "placeholder": "e.g. 300000"
+      "placeholder": "Claude's default"
     },
     "launchArgs": {
       "title": "Launch arguments",
       "description": "Additional CLI arguments passed on session start. --permission-mode and --dangerously-skip-permissions are ignored here; choose the permission mode in the chat input.",
       "placeholder": "e.g. --chrome"
+    },
+    "effective": {
+      "provider": "{{name}} in this provider",
+      "machine": "{{name}} on this machine",
+      "default": "default"
     }
   },
   "probe": {

package/locales/zh-CN.json

@@ -1,4 +1,8 @@
 {
+  "presentation": {
+    "name": "Claude Code",
+    "description": "在 Ycodium 里使用 Claude Code，会话中途也能换模型。"
+  },
   "form": {
     "binaryPath": {
       "title": "程序路径",
@@ -13,17 +17,24 @@
     "credentialsPath": {
       "title": "凭据目录",
       "description": "账号专用的登录目录。凭据单独保存，配置目录仍可共用。",
-      "placeholder": "~/.claude-personal"
+      "placeholder": "~/.claude-personal",
+      "sameAsHome": "与配置目录相同",
+      "keychain": "macOS 钥匙串"
     },
     "autoCompactWindow": {
       "title": "自动压缩阈值",
       "description": "在 100,000 到 1,000,000 个 token 后压缩。留空则使用 Claude 的默认值。",
-      "placeholder": "例如 300000"
+      "placeholder": "Claude 的默认值"
     },
     "launchArgs": {
       "title": "启动参数",
       "description": "会话启动时传入的额外命令行参数。其中的 --permission-mode 与 --dangerously-skip-permissions 会被忽略，权限模式请在输入区选择。",
       "placeholder": "例如 --chrome"
+    },
+    "effective": {
+      "provider": "本 provider 的 {{name}}",
+      "machine": "本机的 {{name}}",
+      "default": "默认"
     }
   },
   "probe": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-claude",
-  "version": "0.2.3681",
+  "version": "0.2.3766",
   "description": "Claude executor: Claude Code CLI via @anthropic-ai/claude-agent-sdk.",
   "keywords": [
     "ycodium",
@@ -24,15 +24,17 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3681",
     "ycodium-composer-tokens": "0.0.0",
     "ycodium-executor-testing": "0.0.0",
+    "@ycodium-ai/plugin-api": "0.2.3766",
     "ycodium-jsonl-stream": "0.0.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",
     "displayName": "Claude Code",
-    "description": "Run Claude Code with in-session model and runtime-mode switching, native compaction, and session import.",
+    "displayNameKey": "presentation.name",
+    "description": "Use Claude Code in Ycodium, switching models mid-session.",
+    "descriptionKey": "presentation.description",
     "icon": "./assets/icon.svg",
     "permissions": [
       {