@ycodium-ai/agent-claude 0.2.2106 → 0.2.2126

package/README.md

@@ -1,8 +1,15 @@
 # @ycodium-ai/agent-claude
 
 Claude executor plugin. Talks to Claude Code through
-`@anthropic-ai/claude-agent-sdk` (`query()`), not ACP. The host Claude driver
-stays in this batch; both cards coexist in the catalog.
+`@anthropic-ai/claude-agent-sdk` (`query()`), not ACP.
+
+Since 2026-09-19 this package **is** the Claude hand: the catalog row carries
+`executorPlugin: "@ycodium-ai/agent-claude"`, the host `ClaudeDriver` /
+`ClaudeAdapter` / `ClaudeProvider` / `ClaudeTextGeneration` are deleted, and the
+built-in `claudeAgent` card no longer joins the catalog. The host keeps one copy
+of the connectivity literal (`executorRegistry.ts` → `officialCardForDriver`)
+because `compileBinding` is synchronous and cannot read the plugin registry;
+`executorRegistry.test.ts` pins the two copies to be byte-identical.
 
 Facts:
 
@@ -13,6 +20,13 @@ Facts:
 - Manifest permission is `{ kind: "executor" }`.
 - Card capabilities: `sessionModelSwitch: "in-session"`, `runtimeModeSwitch: "in-session"`,
   `contextCompaction: "native"`, `turnSteering: true`.
+- `modelConnectivity` carries `baseUrlEnvKey: ANTHROPIC_BASE_URL`,
+  `credentialEnvKey: ANTHROPIC_AUTH_TOKEN` and seven `extraEnv` rows pinning every
+  model-role variable to `$model`. It deliberately does **not** claim
+  `supportsNativeSubscription`: Ycodium has no Claude native-subscription login.
+- Recordings: `test/fixtures/*.sdk.ndjson`, ten scenes captured from Claude Code
+  2.1.277 by `scripts/record-claude-sdk-session.ts`; `src/replay.test.ts` replays
+  them through the same `createQuery` seam the recorder tapped.
 - Quota-probe dissolution: `credentialSources` lists the json-file and
   macOS-keychain locations. `sessions.scan` / `sessions.read` take the Claude
   half of session-import.

package/dist/index.js

@@ -5,7 +5,9 @@ import { definePlugin } from "@ycodium-ai/plugin-api";
 var CLAUDE_DRIVER_KIND = "claudeAgent";
 var CLAUDE_CARD = {
   driverKind: CLAUDE_DRIVER_KIND,
-  displayName: "Claude",
+  // 手叫 Claude Code，不叫 Claude——「Claude」会和脑（Anthropic · Claude Opus 5）混。
+  // 已有实例存的显示名不动，这里只影响新建实例与手脑拆分后的回填名。
+  displayName: "Claude Code",
   iconUrl: "./assets/icon.svg",
   commandName: "claude",
   launchArgs: "",
@@ -60,9 +62,16 @@ var CLAUDE_CARD = {
   verifiedSkills: true,
   everydayHarness: true,
   capabilities: {
+    // 会话中途换模型走 SDK 的 `setModel` 控制请求，不重开会话：`claudeInstance.ts` 的
+    // sendTurn 在 `currentApiModelId` 与本轮选择不一致时调它，`reconfigureSession` 复用
+    // 会话时也是同一条路。录像证据是 `test/fixtures/claudeModelSwitchTurn.sdk.ndjson`
+    // （同一会话两轮不同模型，中间一条 `setModel`）。宿主内置名片此前写 unsupported，
+    // 与 adapter 自己声明给编排的 `"in-session"` 相反——那边是真的，名片是错的。
     sessionModelSwitch: "in-session",
     sessionOptionSwitch: "unsupported",
     runtimeModeSwitch: "in-session",
+    // SDK 的 `setPermissionMode` 会话中途就能改，所以这一位也是真的。
+    nativeModeSwitch: true,
     contextCompaction: "native",
     turnSteering: true
   },
@@ -98,15 +107,34 @@ var CLAUDE_CARD = {
   modelConnectivity: {
     dialects: ["anthropic-messages"],
     acceptsExternalEndpoints: true,
+    // claude 认 origin：CLI 自己在注入的 base 后追加 `/v1/messages`，所以后缀整条
+    // 就是路由，注进去的 base 是纯 origin（compileBinding 按这一栏算出该注什么）。
     nativePathSuffix: "/v1/messages",
-    credentialEnvKey: "ANTHROPIC_API_KEY",
-    supportsNativeSubscription: true
+    // 与宿主内置名片逐字相同。credentialEnvKey 是宿主给绑定注入的那个变量；
+    // alternateCredentialEnvKeys 是 CLI 也认的备选凭据变量（手脑拆分线加的，用来识别捆绑）。
+    baseUrlEnvKey: "ANTHROPIC_BASE_URL",
+    credentialEnvKey: "ANTHROPIC_AUTH_TOKEN",
+    alternateCredentialEnvKeys: ["ANTHROPIC_API_KEY"],
+    supportsNativeSubscription: true,
+    // 七个档位变量一起钉成这次的模型：claude 的 opus / sonnet / haiku / fable 档与
+    // 子代理、小快模型各读一个变量，只钉 `ANTHROPIC_MODEL` 的话子代理会跑回默认档。
+    // 名单与旧 `CLAUDE_SETTINGS_MODEL_ENV_KEYS` 逐字相同（含 2026-09-09 从 2.1.265
+    // 二进制核实出来的 fable 那一条）。`$model` 由 compileBinding 替换。
+    extraEnv: [
+      { name: "ANTHROPIC_MODEL", value: "$model" },
+      { name: "ANTHROPIC_DEFAULT_OPUS_MODEL", value: "$model" },
+      { name: "ANTHROPIC_DEFAULT_SONNET_MODEL", value: "$model" },
+      { name: "ANTHROPIC_DEFAULT_HAIKU_MODEL", value: "$model" },
+      { name: "ANTHROPIC_DEFAULT_FABLE_MODEL", value: "$model" },
+      { name: "ANTHROPIC_SMALL_FAST_MODEL", value: "$model" },
+      { name: "CLAUDE_CODE_SUBAGENT_MODEL", value: "$model" }
+    ]
   }
 };
 
 // src/claudeInstance.ts
 import * as NodeOS6 from "node:os";
-import * as NodePath6 from "node:path";
+import * as NodePath7 from "node:path";
 
 // ../../node_modules/.pnpm/@anthropic-ai+claude-agent-sdk@0.3.170_@anthropic-ai+sdk@0.93.0_zod@4.6.5__@modelcontex_64204813d4dba2ebc464c3aa751485a4/node_modules/@anthropic-ai/claude-agent-sdk/sdk.mjs
 import { createRequire as xz } from "node:module";
@@ -19538,6 +19566,13 @@ function HU(e, t) {
   return null;
 }
 
+// src/claudeInstance.ts
+import {
+  mergeLaunchEnv as mergeLaunchEnv2,
+  withoutBrainSlots,
+  brainSlotEnvKeys as brainSlotEnvKeys3
+} from "@ycodium-ai/plugin-api/executor";
+
 // src/claudeAccount.ts
 import * as NodeFS from "node:fs";
 import * as NodeOS from "node:os";
@@ -19694,6 +19729,10 @@ function expandHomePath(value) {
 
 // src/claudeHome.ts
 var CLAUDE_CREDENTIALS_DIR_ENVIRONMENT_VARIABLE = "CLAUDE_SECURESTORAGE_CONFIG_DIR";
+var CLAUDE_ROUTED_HOME_DIR_NAME = "claude-home";
+function claudeRoutedHomePath(pluginDataDirPath) {
+  return NodePath4.join(pluginDataDirPath, CLAUDE_ROUTED_HOME_DIR_NAME);
+}
 function resolveClaudeHomePath(homePath) {
   const trimmed = homePath.trim();
   return NodePath4.resolve(trimmed.length > 0 ? expandHomePath(trimmed) : NodeOS4.homedir());
@@ -19714,18 +19753,47 @@ function resolveClaudeCredentialsDirPath(credentialsPath) {
   if (trimmed.length === 0) return null;
   return NodePath4.resolve(expandHomePath(trimmed));
 }
-function makeClaudeEnvironment(config, baseEnv) {
-  const resolvedBaseEnv = { ...baseEnv ?? process.env };
-  const homePath = config.homePath.trim();
-  const credentialsDirPath = resolveClaudeCredentialsDirPath(config.credentialsPath);
-  if (homePath.length === 0 && credentialsDirPath === null) return resolvedBaseEnv;
-  const resolvedHomePath = resolveClaudeHomePath(config.homePath);
+function resolveClaudeHomeLayout(input) {
+  const userConfigDirPath = resolveClaudeConfigDirPath(input.homePath, input.environment ?? {});
+  const instanceConfigDirPath = input.homePath.trim().length > 0 ? resolveClaudeHomePath(input.homePath) : void 0;
+  const instanceCredentialsDirPath = resolveClaudeCredentialsDirPath(input.credentialsPath);
+  const routedHomePath = input.routedHomePath?.trim() ?? "";
+  if (routedHomePath.length === 0 || instanceConfigDirPath !== void 0 || instanceCredentialsDirPath !== null) {
+    return {
+      mode: "instance",
+      userConfigDirPath,
+      configDirPath: instanceConfigDirPath,
+      credentialsDirPath: instanceCredentialsDirPath ?? void 0
+    };
+  }
+  const resolvedRoutedHomePath = NodePath4.resolve(expandHomePath(routedHomePath));
+  return {
+    mode: "routed",
+    userConfigDirPath,
+    configDirPath: resolvedRoutedHomePath,
+    // 登录目录显式钉成影子目录本身。不设这个变量时 CLI 本来就把凭据放配置目录，但
+    // 「登录去哪」正是这次要修的东西，不靠默认值。
+    credentialsDirPath: resolvedRoutedHomePath
+  };
+}
+function claudeHomeVariables(layout) {
   return {
-    ...resolvedBaseEnv,
-    ...homePath.length > 0 ? { CLAUDE_CONFIG_DIR: resolvedHomePath } : {},
-    ...credentialsDirPath === null ? {} : { [CLAUDE_CREDENTIALS_DIR_ENVIRONMENT_VARIABLE]: credentialsDirPath }
+    ...layout.configDirPath === void 0 ? {} : { CLAUDE_CONFIG_DIR: layout.configDirPath },
+    ...layout.credentialsDirPath === void 0 ? {} : { [CLAUDE_CREDENTIALS_DIR_ENVIRONMENT_VARIABLE]: layout.credentialsDirPath }
   };
 }
+function makeClaudeEnvironment(config, baseEnv) {
+  const resolvedBaseEnv = { ...baseEnv ?? process.env };
+  const variables = claudeHomeVariables(
+    resolveClaudeHomeLayout({
+      homePath: config.homePath,
+      credentialsPath: config.credentialsPath,
+      environment: resolvedBaseEnv
+    })
+  );
+  if (Object.keys(variables).length === 0) return resolvedBaseEnv;
+  return { ...resolvedBaseEnv, ...variables };
+}
 
 // src/claudeSignIn.ts
 var POSIX_BARE_VALUE = /^[A-Za-z0-9_@%+=:,./-]+$/;
@@ -19953,8 +20021,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((resolve2) => {
-          this.#waiters.push(resolve2);
+        return new Promise((resolve3) => {
+          this.#waiters.push(resolve3);
         });
       }
     };
@@ -19962,6 +20030,7 @@ var EventBus = class {
 };
 
 // src/model.ts
+import { matchCatalogModel } from "@ycodium-ai/plugin-api/executor";
 var DEFAULT_CLAUDE_MODEL_CAPABILITIES = {
   optionDescriptors: []
 };
@@ -19969,6 +20038,10 @@ var CLAUDE_CUSTOM_MODEL_THINKING_SELECT = {
   id: "effort",
   label: "Reasoning"
 };
+var MINIMUM_CLAUDE_OPUS_5_VERSION = "2.1.219";
+var MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
+var MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
+var MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
 var CURRENT_CLAUDE_MODELS = /* @__PURE__ */ new Set(["claude-fable-5", "claude-opus-5", "claude-sonnet-5"]);
 function isLegacyClaudeModel(model) {
   return !CURRENT_CLAUDE_MODELS.has(model);
@@ -20209,6 +20282,35 @@ var CLAUDE_XHIGH_SLUGS = /* @__PURE__ */ new Set([
   "claude-opus-4-8",
   "claude-sonnet-5"
 ]);
+function compareSemverVersions(left, right) {
+  const parse = (value) => {
+    const match = value.trim().replace(/^v/, "").match(/^(\d+)\.(\d+)\.(\d+)/);
+    if (!match) return null;
+    return [Number(match[1]), Number(match[2]), Number(match[3])];
+  };
+  const a = parse(left);
+  const b3 = parse(right);
+  if (!a || !b3) return left.localeCompare(right);
+  if (a[0] !== b3[0]) return a[0] - b3[0];
+  if (a[1] !== b3[1]) return a[1] - b3[1];
+  return a[2] - b3[2];
+}
+function supportsVersion(version, minimum) {
+  return version ? compareSemverVersions(version, minimum) >= 0 : false;
+}
+function getBuiltInClaudeModelsForVersion(version) {
+  return BUILT_IN_MODELS.filter((model) => {
+    if (model.slug === "claude-opus-5")
+      return supportsVersion(version, MINIMUM_CLAUDE_OPUS_5_VERSION);
+    if (model.slug === "claude-fable-5")
+      return supportsVersion(version, MINIMUM_CLAUDE_FABLE_5_VERSION);
+    if (model.slug === "claude-opus-4-8")
+      return supportsVersion(version, MINIMUM_CLAUDE_OPUS_4_8_VERSION);
+    if (model.slug === "claude-opus-4-7")
+      return supportsVersion(version, MINIMUM_CLAUDE_OPUS_4_7_VERSION);
+    return true;
+  });
+}
 function parseGenericCliVersion(output) {
   const match = output.match(/\b(\d+\.\d+\.\d+)\b/);
   return match?.[1] ?? null;
@@ -20316,6 +20418,13 @@ function resolveClaudeContextWindow(caps, modelSelection) {
   if (!descriptor || descriptor.type !== "select") return void 0;
   return currentSelectValue(descriptor, raw);
 }
+function claudeCliModelId(input) {
+  const catalog = [
+    ...BUILT_IN_MODELS.map((model) => model.slug),
+    ...(input.customModels ?? []).map((model) => normalizeCustomModelSlug(model.slug))
+  ];
+  return matchCatalogModel(input.boundModelId, catalog) ?? input.placeholder;
+}
 function resolveClaudeApiModelId(caps, modelSelection) {
   switch (resolveClaudeContextWindow(caps, modelSelection)) {
     case "1m":
@@ -20386,6 +20495,15 @@ function toMessage(cause, fallback) {
   }
   return fallback;
 }
+function createOutputTail(maxChars) {
+  let buffered = "";
+  return {
+    append: (chunk) => {
+      buffered = (buffered + chunk).slice(-maxChars);
+    },
+    read: () => buffered.trim()
+  };
+}
 function asRuntimeItemId(value) {
   return value;
 }
@@ -20533,10 +20651,10 @@ function inputDiffStat(input) {
   let deletions = 0;
   for (const edit of input.edits) {
     if (edit === null || typeof edit !== "object" || Array.isArray(edit)) return void 0;
-    const stat = replacementDiffStat(edit, budget);
-    if (!stat) return void 0;
-    additions += stat.additions;
-    deletions += stat.deletions;
+    const stat2 = replacementDiffStat(edit, budget);
+    if (!stat2) return void 0;
+    additions += stat2.additions;
+    deletions += stat2.deletions;
   }
   return { additions, deletions };
 }
@@ -21071,11 +21189,40 @@ function diffClaudeSessionSettings(previous, next) {
   }
   return changed ? patch : void 0;
 }
-var CLAUDE_PERMISSION_MODE_BY_RUNTIME_MODE = {
+var CLAUDE_NATIVE_MODES = [
+  { id: "default", name: "Manual", description: "Always ask before making changes" },
+  { id: "acceptEdits", name: "Accept edits", description: "Automatically accept all file edits" },
+  { id: "plan", name: "Plan", description: "Create a plan before making changes" },
+  { id: "auto", name: "Auto", description: "Claude handles permission decisions" },
+  {
+    id: "bypassPermissions",
+    name: "Bypass permissions",
+    description: "Accepts all permissions"
+  }
+];
+var CLAUDE_DEFAULT_NATIVE_MODE_ID = "default";
+var CLAUDE_NATIVE_MODE_BY_RUNTIME_MODE = {
+  "approval-required": "default",
   "auto-accept-edits": "acceptEdits",
   auto: "auto",
   "full-access": "bypassPermissions"
 };
+var CLAUDE_NATIVE_MODE_REPORT = {
+  nativeModes: CLAUDE_NATIVE_MODES.map((mode) => ({
+    id: mode.id,
+    name: mode.name,
+    description: mode.description
+  })),
+  currentNativeModeId: CLAUDE_DEFAULT_NATIVE_MODE_ID,
+  nativeModeByRuntimeMode: CLAUDE_NATIVE_MODE_BY_RUNTIME_MODE
+};
+function isClaudeNativeModeId(value) {
+  return CLAUDE_NATIVE_MODES.some((mode) => mode.id === value);
+}
+function claudePermissionModeFor(runtimeMode, nativeModeId) {
+  if (nativeModeId !== void 0 && isClaudeNativeModeId(nativeModeId)) return nativeModeId;
+  return CLAUDE_NATIVE_MODE_BY_RUNTIME_MODE[runtimeMode];
+}
 var CLAUDE_SETTING_SOURCES = [
   "user",
   "project",
@@ -21213,17 +21360,17 @@ function listTranscriptFiles(transcriptDir, directory) {
       continue;
     }
     for (const name of names) {
-      let stat;
+      let stat2;
       try {
-        stat = NodeFS3.statSync(NodePath5.join(projectDir, name));
+        stat2 = NodeFS3.statSync(NodePath5.join(projectDir, name));
       } catch {
         continue;
       }
       found.push({
         path: NodePath5.join(projectDir, name),
         sessionId: name.slice(0, -TRANSCRIPT_SUFFIX.length),
-        size: stat.size,
-        mtimeMs: Number.isFinite(stat.mtimeMs) ? stat.mtimeMs : 0
+        size: stat2.size,
+        mtimeMs: Number.isFinite(stat2.mtimeMs) ? stat2.mtimeMs : 0
       });
     }
   }
@@ -21787,6 +21934,305 @@ function normalizeClaudeTaskProgressTokenUsage(value, memory) {
   };
 }
 
+// src/probeModels.ts
+var CONTEXT_WINDOW_TOKENS = {
+  "200k": 2e5,
+  "1m": 1e6
+};
+var defaultContextWindowOf = (caps) => {
+  const descriptor = caps.optionDescriptors.find(
+    (entry) => entry.type === "select" && entry.id === "contextWindow"
+  );
+  if (descriptor === void 0) return void 0;
+  const chosen = descriptor.options.find((option) => option.isDefault === true);
+  return chosen === void 0 ? void 0 : CONTEXT_WINDOW_TOKENS[chosen.id];
+};
+var toProbeCapabilities = (caps) => ({
+  optionDescriptors: caps.optionDescriptors.map(
+    (descriptor) => descriptor.type === "select" ? {
+      id: descriptor.id,
+      label: descriptor.label,
+      type: "select",
+      options: descriptor.options.map((option) => ({
+        id: option.id,
+        label: option.label,
+        ...option.description === void 0 ? {} : { description: option.description },
+        ...option.isDefault === void 0 ? {} : { isDefault: option.isDefault }
+      }))
+    } : {
+      id: descriptor.id,
+      label: descriptor.label,
+      type: "boolean"
+    }
+  )
+});
+var claudeProbeModels = (input) => {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const model of input.builtIn) {
+    if (seen.has(model.slug)) continue;
+    seen.add(model.slug);
+    const userLabel = input.customModels.find((entry) => entry.slug === model.slug)?.label;
+    const contextWindow = defaultContextWindowOf(model.capabilities);
+    out.push({
+      slug: model.slug,
+      name: userLabel?.trim() || model.name,
+      ...model.isLegacy === void 0 ? {} : { isLegacy: model.isLegacy },
+      capabilities: toProbeCapabilities(model.capabilities),
+      ...contextWindow === void 0 ? {} : { contextWindow }
+    });
+  }
+  for (const model of input.customModels) {
+    if (model.slug.trim().length === 0 || seen.has(model.slug)) continue;
+    seen.add(model.slug);
+    out.push({ slug: model.slug, name: model.label?.trim() || model.slug });
+  }
+  for (const model of input.discovered ?? []) {
+    if (seen.has(model.slug)) continue;
+    seen.add(model.slug);
+    out.push(model);
+  }
+  return out;
+};
+
+// src/routedHome.ts
+import * as NodeFSP from "node:fs/promises";
+import * as NodePath6 from "node:path";
+
+// src/routedSettings.ts
+import { brainSlotEnvKeys } from "@ycodium-ai/plugin-api";
+var PROXY_ENV_KEYS = [
+  "HTTP_PROXY",
+  "HTTPS_PROXY",
+  "NO_PROXY",
+  "ALL_PROXY",
+  "http_proxy",
+  "https_proxy",
+  "no_proxy",
+  "all_proxy"
+];
+function isRoutedLaunch(launchProcessEnv) {
+  const baseUrlKey = CLAUDE_CARD.modelConnectivity.baseUrlEnvKey;
+  if (baseUrlKey === void 0) return false;
+  return (launchProcessEnv?.[baseUrlKey] ?? "").trim().length > 0;
+}
+function routedEnvOverride(input) {
+  if (!isRoutedLaunch(input.launchProcessEnv)) return void 0;
+  const valueOf = (key) => input.mergedEnv[key] ?? "";
+  const override = {};
+  for (const key of brainSlotEnvKeys(CLAUDE_CARD)) override[key] = valueOf(key);
+  for (const { name } of CLAUDE_CARD.modelConnectivity.extraEnv ?? []) {
+    const bound = valueOf(name);
+    override[name] = bound.length === 0 ? "" : claudeCliModelId({
+      boundModelId: bound,
+      placeholder: CLAUDE_CARD.defaultModel,
+      ...input.customModels === void 0 ? {} : { customModels: input.customModels }
+    });
+  }
+  for (const key of PROXY_ENV_KEYS) override[key] = valueOf(key);
+  return override;
+}
+
+// src/routedHome.ts
+var BORROWED_ENTRY_NAMES = [
+  "projects",
+  "plugins",
+  "skills",
+  "agents",
+  "commands",
+  "CLAUDE.md"
+];
+var GLOBAL_CONFIG_FILE_NAME = ".claude.json";
+var USER_SETTINGS_FILE_NAME = "settings.json";
+var ROUTING_AND_IDENTITY_SETTING_KEYS = [
+  "env",
+  "apiKeyHelper",
+  "awsAuthRefresh",
+  "awsCredentialExport"
+];
+var FIRST_RUN_FLAG_KEYS = ["hasCompletedOnboarding", "bypassPermissionsModeAccepted"];
+function isRecord5(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+async function readTextFile(filePath) {
+  try {
+    return await NodeFSP.readFile(filePath, "utf8");
+  } catch {
+    return null;
+  }
+}
+function parseJsonObject(raw) {
+  try {
+    const parsed = JSON.parse(raw);
+    return isRecord5(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+async function writeFileAtomic(filePath, contents) {
+  const tempPath = `${filePath}.${crypto.randomUUID()}.tmp`;
+  await NodeFSP.writeFile(tempPath, contents, { encoding: "utf8", mode: 384 });
+  await NodeFSP.rename(tempPath, filePath);
+}
+async function readLinkState(linkPath) {
+  try {
+    return { _tag: "Symlink", target: await NodeFSP.readlink(linkPath) };
+  } catch (error) {
+    const code = typeof error === "object" && error !== null && "code" in error ? String(error.code) : "";
+    if (code === "ENOENT") return { _tag: "Missing" };
+    return { _tag: "NotSymlink" };
+  }
+}
+async function isEmptyDirectory(path) {
+  try {
+    return (await NodeFSP.readdir(path)).length === 0;
+  } catch {
+    return false;
+  }
+}
+async function borrowEntry(input) {
+  const target = NodePath6.join(input.userConfigDirPath, input.entryName);
+  const targetInfo = await NodeFSP.stat(target).then(
+    (info) => info,
+    () => null
+  );
+  if (targetInfo === null) return;
+  const link = NodePath6.join(input.configDirPath, input.entryName);
+  const state = await readLinkState(link);
+  if (state._tag === "NotSymlink") {
+    if (!await isEmptyDirectory(link)) {
+      input.log?.warn("Claude routed home entry left unlinked: a real entry is already there.", {
+        entryName: input.entryName,
+        link
+      });
+      return;
+    }
+    await NodeFSP.rm(link, { recursive: true, force: true });
+    await NodeFSP.symlink(target, link, targetInfo.isDirectory() ? "junction" : "file");
+    return;
+  }
+  if (state._tag === "Symlink") {
+    if (NodePath6.resolve(NodePath6.dirname(link), state.target) === target) return;
+    await NodeFSP.rm(link, { force: true });
+  }
+  await NodeFSP.symlink(target, link, targetInfo.isDirectory() ? "junction" : "file");
+}
+async function mirrorUserSettings(input) {
+  const sourcePath = NodePath6.join(input.userConfigDirPath, USER_SETTINGS_FILE_NAME);
+  const raw = await readTextFile(sourcePath);
+  if (raw === null) return;
+  const parsed = parseJsonObject(raw);
+  if (parsed === null) {
+    input.log?.warn(
+      "Claude routed home settings mirror skipped: the source is not a JSON object.",
+      {
+        sourcePath
+      }
+    );
+    return;
+  }
+  const mirrored = { ...parsed };
+  for (const key of ROUTING_AND_IDENTITY_SETTING_KEYS) delete mirrored[key];
+  const targetPath = NodePath6.join(input.configDirPath, USER_SETTINGS_FILE_NAME);
+  const desired = `${JSON.stringify(mirrored, null, 2)}
+`;
+  if (await readTextFile(targetPath) === desired) return;
+  await writeFileAtomic(targetPath, desired);
+}
+async function seedFirstRun(input) {
+  const filePath = NodePath6.join(input.configDirPath, GLOBAL_CONFIG_FILE_NAME);
+  const raw = await readTextFile(filePath);
+  const parsed = raw === null ? {} : parseJsonObject(raw);
+  if (parsed === null) {
+    input.log?.warn("Claude routed home first-run seed skipped: the config file is not readable.", {
+      filePath
+    });
+    return;
+  }
+  const next = { ...parsed };
+  let changed = false;
+  if (raw === null) {
+    for (const key of FIRST_RUN_FLAG_KEYS) next[key] = true;
+    changed = true;
+  }
+  const existingProjects = next["projects"];
+  const projects = isRecord5(existingProjects) ? { ...existingProjects } : {};
+  for (const trustedPath of input.trustedPaths) {
+    const resolved = NodePath6.resolve(trustedPath);
+    const entry = projects[resolved];
+    const project = isRecord5(entry) ? { ...entry } : {};
+    if (project["hasTrustDialogAccepted"] === true) continue;
+    project["hasTrustDialogAccepted"] = true;
+    projects[resolved] = project;
+    changed = true;
+  }
+  if (Object.keys(projects).length > 0) next["projects"] = projects;
+  if (!changed) return;
+  await writeFileAtomic(filePath, `${JSON.stringify(next, null, 2)}
+`);
+}
+function resolveClaudeLaunchHome(input) {
+  const routed = isRoutedLaunch(input.launchProcessEnv);
+  const dataDirPath = input.pluginDataDirPath?.trim() ?? "";
+  if (routed && dataDirPath.length === 0) {
+    input.log?.warn(
+      "Ycodium is routing this turn but has no directory of its own to hand the CLI; it will read the user's."
+    );
+  }
+  return resolveClaudeHomeLayout({
+    homePath: input.homePath,
+    credentialsPath: input.credentialsPath,
+    ...routed && dataDirPath.length > 0 ? { routedHomePath: claudeRoutedHomePath(dataDirPath) } : {},
+    ...input.environment === void 0 ? {} : { environment: input.environment }
+  });
+}
+async function materializeClaudeRoutedHome(layout, options) {
+  if (layout.mode !== "routed") return;
+  const configDirPath = layout.configDirPath;
+  if (configDirPath === void 0) return;
+  if (configDirPath === layout.userConfigDirPath) {
+    throw new Error(
+      `Ycodium's Claude configuration directory '${configDirPath}' must differ from the user's.`
+    );
+  }
+  await NodeFSP.mkdir(configDirPath, { recursive: true });
+  await NodeFSP.chmod(configDirPath, 448);
+  const credentialsDirPath = layout.credentialsDirPath;
+  if (credentialsDirPath !== void 0 && credentialsDirPath !== configDirPath) {
+    await NodeFSP.mkdir(credentialsDirPath, { recursive: true });
+    await NodeFSP.chmod(credentialsDirPath, 448);
+  }
+  const log = options?.log;
+  for (const entryName of BORROWED_ENTRY_NAMES) {
+    try {
+      await borrowEntry({
+        userConfigDirPath: layout.userConfigDirPath,
+        configDirPath,
+        entryName,
+        log
+      });
+    } catch (error) {
+      log?.warn("Claude routed home entry left unlinked.", {
+        entryName,
+        reason: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  await mirrorUserSettings({
+    userConfigDirPath: layout.userConfigDirPath,
+    configDirPath,
+    log
+  });
+  await seedFirstRun({
+    configDirPath,
+    trustedPaths: options?.trustedPaths ?? [],
+    log
+  });
+}
+
+// src/textGeneration.ts
+import { mergeLaunchEnv, brainSlotEnvKeys as brainSlotEnvKeys2 } from "@ycodium-ai/plugin-api/executor";
+
 // src/textGenerationUtils.ts
 function limitSection(value, maxChars) {
   if (value.length <= maxChars) return value;
@@ -22134,7 +22580,7 @@ function buildHandoverSummaryPrompt(input) {
 
 // src/textGeneration.ts
 var CLAUDE_TIMEOUT_MS = 18e4;
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function readString3(value) {
@@ -22156,18 +22602,31 @@ function decodeStructuredOutput(stdout, operation) {
       cause: error
     });
   }
-  if (!isRecord5(parsed) || !("structured_output" in parsed)) {
+  if (!isRecord6(parsed) || !("structured_output" in parsed)) {
     throw new Error(`${operation}: Claude CLI returned unexpected output format.`);
   }
   return parsed.structured_output;
 }
-function createClaudeTextGeneration(recipe, host) {
+function createClaudeTextGeneration(recipe, host, pluginDataDirPath) {
   const runClaudeJson = async (input) => {
-    const processEnv = {
-      ...makeClaudeEnvironment(recipe, input.launch?.processEnv ?? process.env),
-      ...compactEnv(input.launch?.processEnv)
-    };
-    const modelSelection = isRecord5(input.modelSelection) ? input.modelSelection : {};
+    const homeLayout = resolveClaudeLaunchHome({
+      homePath: recipe.homePath,
+      credentialsPath: recipe.credentialsPath,
+      launchProcessEnv: input.launch?.processEnv,
+      pluginDataDirPath,
+      log: host.log
+    });
+    await materializeClaudeRoutedHome(homeLayout, {
+      trustedPaths: [input.cwd],
+      log: host.log
+    });
+    const processEnv = mergeLaunchEnv({
+      brainSlots: brainSlotEnvKeys2(CLAUDE_CARD),
+      instanceTable: recipe.environment,
+      handOverrides: claudeHomeVariables(homeLayout),
+      launch: input.launch?.processEnv
+    });
+    const modelSelection = isRecord6(input.modelSelection) ? input.modelSelection : {};
     const requestedModel = input.launch?.requestedModelId ?? modelIdFromSelection(modelSelection) ?? "claude-haiku-4-5";
     const caps = claudeModelCapabilities(requestedModel, recipe.customModels);
     const rawEffort = getModelSelectionStringOptionValue(modelSelection, "effort");
@@ -22200,7 +22659,7 @@ function createClaudeTextGeneration(recipe, host) {
       program,
       args,
       cwd: input.cwd,
-      env: compactEnv(processEnv),
+      env: processEnv,
       owner: { bindingId: host.bindingId }
     });
     const timeout = AbortSignal.timeout(CLAUDE_TIMEOUT_MS);
@@ -22229,7 +22688,7 @@ function createClaudeTextGeneration(recipe, host) {
     return decodeStructuredOutput(stdout, input.operation);
   };
   const asRecord = (value, operation) => {
-    if (!isRecord5(value))
+    if (!isRecord6(value))
       throw new Error(`${operation}: Claude returned invalid structured output.`);
     return value;
   };
@@ -22243,7 +22702,7 @@ function createClaudeTextGeneration(recipe, host) {
           stagedSummary: readString3(input["stagedSummary"]),
           stagedPatch: readString3(input["stagedPatch"]),
           includeBranch,
-          ...isRecord5(input["policy"]) ? { policy: input["policy"] } : {}
+          ...isRecord6(input["policy"]) ? { policy: input["policy"] } : {}
         });
         const generated = asRecord(
           await runClaudeJson({
@@ -22252,7 +22711,7 @@ function createClaudeTextGeneration(recipe, host) {
             prompt,
             outputSchema,
             modelSelection: input["modelSelection"],
-            ...isRecord5(input["launch"]) ? { launch: input["launch"] } : {},
+            ...isRecord6(input["launch"]) ? { launch: input["launch"] } : {},
             ...signal === void 0 ? {} : { signal }
           }),
           "generateCommitMessage"
@@ -22276,7 +22735,7 @@ function createClaudeTextGeneration(recipe, host) {
           diffSummary: readString3(input["diffSummary"]),
           diffPatch: readString3(input["diffPatch"]),
           ...typeof input["changeRequestTemplate"] === "string" ? { changeRequestTemplate: input["changeRequestTemplate"] } : {},
-          ...isRecord5(input["policy"]) ? { policy: input["policy"] } : {}
+          ...isRecord6(input["policy"]) ? { policy: input["policy"] } : {}
         });
         const generated = asRecord(
           await runClaudeJson({
@@ -22285,7 +22744,7 @@ function createClaudeTextGeneration(recipe, host) {
             prompt,
             outputSchema,
             modelSelection: input["modelSelection"],
-            ...isRecord5(input["launch"]) ? { launch: input["launch"] } : {},
+            ...isRecord6(input["launch"]) ? { launch: input["launch"] } : {},
             ...signal === void 0 ? {} : { signal }
           }),
           "generatePrContent"
@@ -22304,7 +22763,7 @@ function createClaudeTextGeneration(recipe, host) {
         const { prompt, outputSchema } = buildBranchNamePrompt({
           message: readString3(input["message"]),
           ...Array.isArray(input["attachments"]) ? { attachments: input["attachments"] } : {},
-          ...isRecord5(input["policy"]) ? { policy: input["policy"] } : {}
+          ...isRecord6(input["policy"]) ? { policy: input["policy"] } : {}
         });
         const generated = asRecord(
           await runClaudeJson({
@@ -22313,7 +22772,7 @@ function createClaudeTextGeneration(recipe, host) {
             prompt,
             outputSchema,
             modelSelection: input["modelSelection"],
-            ...isRecord5(input["launch"]) ? { launch: input["launch"] } : {},
+            ...isRecord6(input["launch"]) ? { launch: input["launch"] } : {},
             ...signal === void 0 ? {} : { signal }
           }),
           "generateBranchName"
@@ -22330,7 +22789,7 @@ function createClaudeTextGeneration(recipe, host) {
           message: readString3(input["message"]),
           ...typeof input["previousTitle"] === "string" ? { previousTitle: input["previousTitle"] } : {},
           ...Array.isArray(input["attachments"]) ? { attachments: input["attachments"] } : {},
-          ...isRecord5(input["policy"]) ? { policy: input["policy"] } : {}
+          ...isRecord6(input["policy"]) ? { policy: input["policy"] } : {}
         });
         const generated = asRecord(
           await runClaudeJson({
@@ -22339,7 +22798,7 @@ function createClaudeTextGeneration(recipe, host) {
             prompt,
             outputSchema,
             modelSelection: input["modelSelection"],
-            ...isRecord5(input["launch"]) ? { launch: input["launch"] } : {},
+            ...isRecord6(input["launch"]) ? { launch: input["launch"] } : {},
             ...signal === void 0 ? {} : { signal }
           }),
           "generateThreadTitle"
@@ -22362,7 +22821,7 @@ function createClaudeTextGeneration(recipe, host) {
             prompt,
             outputSchema,
             modelSelection: input["modelSelection"],
-            ...isRecord5(input["launch"]) ? { launch: input["launch"] } : {},
+            ...isRecord6(input["launch"]) ? { launch: input["launch"] } : {},
             ...signal === void 0 ? {} : { signal }
           }),
           "summarizeHandover"
@@ -22374,14 +22833,6 @@ function createClaudeTextGeneration(recipe, host) {
     }
   };
 }
-function compactEnv(env) {
-  const out = {};
-  if (!env) return out;
-  for (const [key, value] of Object.entries(env)) {
-    if (value !== void 0) out[key] = value;
-  }
-  return out;
-}
 
 // src/imageMime.ts
 var IMAGE_EXTENSION_BY_MIME_TYPE = {
@@ -22463,9 +22914,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((resolve2) => {
+    return new Promise((resolve3) => {
       this.#waiters.push((result) => {
-        resolve2(result.done ? void 0 : result.value);
+        resolve3(result.done ? void 0 : result.value);
       });
     });
   }
@@ -22496,6 +22947,7 @@ var SUPPORTED_CLAUDE_IMAGE_MIME_TYPES = /* @__PURE__ */ new Set([
 ]);
 var CLAUDE_INTERRUPT_GRACE_MS = 5e3;
 var CLAUDE_SESSION_CONTEXT_WAIT_MS = 1e4;
+var CLAUDE_STDERR_TAIL_CHARS = 4e3;
 function asClaudeModelSelection(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
   return value;
@@ -22583,7 +23035,7 @@ async function persistProducedImage(input) {
 }
 
 // src/claudeInstance.ts
-function compactEnv2(env) {
+function compactEnv(env) {
   const out = {};
   if (!env) return out;
   for (const [key, value] of Object.entries(env)) {
@@ -22591,10 +23043,26 @@ function compactEnv2(env) {
   }
   return out;
 }
+function toClaudeMcpServers(entries) {
+  if (entries === void 0 || entries.length === 0) return void 0;
+  const servers = {};
+  for (const entry of entries) {
+    servers[entry.name] = entry.transport.type === "stdio" ? {
+      type: "stdio",
+      command: entry.transport.command,
+      ...entry.transport.args === void 0 ? {} : { args: [...entry.transport.args] },
+      ...entry.transport.env === void 0 ? {} : { env: { ...entry.transport.env } }
+    } : {
+      type: entry.transport.type,
+      url: entry.transport.url,
+      ...entry.transport.headers === void 0 ? {} : { headers: { ...entry.transport.headers } }
+    };
+  }
+  return servers;
+}
 function createClaudeAdapter(recipe, host, options) {
   const boundInstanceId = options?.instanceId ?? host.instanceId ?? "claudeAgent";
   const claudeHomeEnvironment = makeClaudeEnvironment(recipe, options?.environment);
-  const sessionLaunchEnv = /* @__PURE__ */ new Map();
   const claudeSdkExecutablePath = resolveClaudeSdkExecutablePath(
     recipe.binaryPath,
     claudeHomeEnvironment
@@ -22886,8 +23354,8 @@ function createClaudeAdapter(recipe, host, options) {
     try {
       usage = await Promise.race([
         context.query.getContextUsage(),
-        new Promise((resolve2) => {
-          setTimeout(() => resolve2(void 0), 1e3);
+        new Promise((resolve3) => {
+          setTimeout(() => resolve3(void 0), 1e3);
         })
       ]);
     } catch {
@@ -24180,7 +24648,9 @@ function createClaudeAdapter(recipe, host, options) {
           await completeTurn(context, "interrupted", "Claude runtime interrupted.");
         }
       } else {
-        const message = cause instanceof Error ? cause.message : "Claude runtime stream failed.";
+        const cliSaid = context.stderrTail.read();
+        const reason = cause instanceof Error ? cause.message : "Claude runtime stream failed.";
+        const message = cliSaid.length > 0 ? `${reason}: ${cliSaid}` : reason;
         await emitRuntimeError(context, message, { cause: String(cause) });
         await completeTurn(context, "failed", message);
       }
@@ -24256,7 +24726,7 @@ function createClaudeAdapter(recipe, host, options) {
       if (streamFiber) {
         await Promise.race([
           streamFiber.catch(() => void 0),
-          new Promise((resolve2) => setTimeout(resolve2, 1e3))
+          new Promise((resolve3) => setTimeout(resolve3, 1e3))
         ]);
       }
       const updatedAt = nowIso();
@@ -24283,9 +24753,6 @@ function createClaudeAdapter(recipe, host, options) {
       }
       if (sessions.get(context.session.threadId) === context) {
         sessions.delete(context.session.threadId);
-        if (stopOptions?.keepLaunch !== true) {
-          sessionLaunchEnv.delete(context.session.threadId);
-        }
       }
     })();
     context.stopWork = work;
@@ -24365,7 +24832,13 @@ function createClaudeAdapter(recipe, host, options) {
     const modelSelection = boundModelSelection(input.modelSelection, boundInstanceId);
     const caps = claudeModelCapabilities(modelSelection?.model, recipe.customModels);
     const descriptors = caps.optionDescriptors;
-    const apiModelId = modelSelection?.model ? resolveClaudeApiModelId(caps, { model: modelSelection.model }) : void 0;
+    const apiModelId = modelSelection?.model ? resolveClaudeApiModelId(caps, {
+      model: claudeCliModelId({
+        boundModelId: modelSelection.model,
+        placeholder: CLAUDE_CARD.defaultModel,
+        customModels: recipe.customModels
+      })
+    }) : void 0;
     const initialContextWindow = selectedClaudeContextWindow(caps, modelSelection);
     const rawEffort = getModelSelectionStringOptionValue(modelSelection, "effort");
     const effort = resolveClaudeEffort(caps, rawEffort) ?? null;
@@ -24379,16 +24852,13 @@ function createClaudeAdapter(recipe, host, options) {
     const thinking = thinkingSupported ? getModelSelectionBooleanOptionValue(modelSelection, "thinking") : void 0;
     const ultracode = isClaudeUltracodeEffort(effort);
     const effectiveEffort = getEffectiveClaudeAgentEffort(effort, modelSelection?.model, caps);
-    const permissionMode = CLAUDE_PERMISSION_MODE_BY_RUNTIME_MODE[input.runtimeMode];
+    const permissionMode = claudePermissionModeFor(input.runtimeMode, input.nativeModeId);
     const settings = buildClaudeSessionSettings({
       thinking,
       fastMode,
       ultracode,
       autoCompactWindow: recipe.autoCompactWindow
     });
-    if (input.launch.processEnv) {
-      sessionLaunchEnv.set(input.threadId, input.launch.processEnv);
-    }
     const existingContext = sessions.get(input.threadId);
     if (existingContext) {
       const reconfigured = await reconfigureSession(existingContext, input, {
@@ -24407,10 +24877,7 @@ function createClaudeAdapter(recipe, host, options) {
         existingSessionStatus: existingContext.session.status,
         reason: "startSession called with existing active session"
       });
-      await stopSessionInternal(existingContext, {
-        emitExitEvent: false,
-        keepLaunch: true
-      });
+      await stopSessionInternal(existingContext, { emitExitEvent: false });
     }
     const startedAt = nowIso();
     const resumeState = input.discardResumeCursor === true ? void 0 : readClaudeResumeState(input.resumeCursor);
@@ -24433,7 +24900,7 @@ function createClaudeAdapter(recipe, host, options) {
         return await Promise.race([
           contextDeferred.promise,
           new Promise(
-            (resolve2) => setTimeout(() => resolve2(void 0), CLAUDE_SESSION_CONTEXT_WAIT_MS)
+            (resolve3) => setTimeout(() => resolve3(void 0), CLAUDE_SESSION_CONTEXT_WAIT_MS)
           )
         ]);
       } catch {
@@ -24575,7 +25042,7 @@ function createClaudeAdapter(recipe, host, options) {
           message: "The client captured your proposed plan. Stop here and wait for the user's feedback or implementation request in a later turn."
         };
       }
-      if (context2.session.runtimeMode === "full-access") {
+      if (context2.currentPermissionMode === "bypassPermissions") {
         return {
           behavior: "allow",
           updatedInput: toolInput
@@ -24716,16 +25183,33 @@ function createClaudeAdapter(recipe, host, options) {
     };
     const onUserDialog = (request, callbackOptions) => handleResumeDialog(request, callbackOptions);
     const additionalDirectories = input.cwd ? [input.cwd] : [];
-    const launchEnvironment = {
-      ...makeClaudeEnvironment(recipe, {
-        ...process.env,
-        ...options?.environment,
-        ...recipe.environment,
-        ...sessionLaunchEnv.get(threadId)
-      }),
-      ...compactEnv2(input.launch.processEnv)
-    };
-    const querySettings = settings;
+    const mcpServers = toClaudeMcpServers(input.mcpServers);
+    const homeLayout = resolveClaudeLaunchHome({
+      homePath: recipe.homePath,
+      credentialsPath: recipe.credentialsPath,
+      launchProcessEnv: input.launch.processEnv,
+      pluginDataDirPath: options?.pluginDataDirPath,
+      environment: claudeHomeEnvironment,
+      ...options?.log === void 0 ? {} : { log: options.log }
+    });
+    await materializeClaudeRoutedHome(homeLayout, {
+      ...input.cwd ? { trustedPaths: [input.cwd] } : {},
+      ...options?.log === void 0 ? {} : { log: options.log }
+    });
+    const launchEnvironment = mergeLaunchEnv2({
+      brainSlots: brainSlotEnvKeys3(CLAUDE_CARD),
+      inherited: { ...process.env, ...options?.environment },
+      instanceTable: recipe.environment,
+      handOverrides: claudeHomeVariables(homeLayout),
+      launch: input.launch.processEnv
+    });
+    const envOverride = routedEnvOverride({
+      launchProcessEnv: input.launch.processEnv,
+      mergedEnv: launchEnvironment,
+      ...recipe.customModels === void 0 ? {} : { customModels: recipe.customModels }
+    });
+    const querySettings = envOverride === void 0 ? { ...settings } : { ...settings, env: envOverride };
+    const stderrTail = createOutputTail(CLAUDE_STDERR_TAIL_CHARS);
     const queryOptions = {
       ...input.cwd ? { cwd: input.cwd } : {},
       ...apiModelId ? { model: apiModelId } : {},
@@ -24741,6 +25225,7 @@ function createClaudeAdapter(recipe, host, options) {
       ...existingResumeSessionId ? { resume: existingResumeSessionId } : {},
       ...newSessionId ? { sessionId: newSessionId } : {},
       includePartialMessages: true,
+      stderr: stderrTail.append,
       canUseTool,
       onUserDialog,
       hooks: {
@@ -24758,9 +25243,10 @@ function createClaudeAdapter(recipe, host, options) {
         ]
       },
       supportedDialogKinds: ["resume_return"],
-      env: compactEnv2(launchEnvironment),
+      env: compactEnv(launchEnvironment),
       additionalDirectories,
-      ...Object.keys(extraArgs).length > 0 ? { extraArgs } : {}
+      ...Object.keys(extraArgs).length > 0 ? { extraArgs } : {},
+      ...mcpServers === void 0 ? {} : { mcpServers }
     };
     let queryRuntime;
     try {
@@ -24777,6 +25263,7 @@ function createClaudeAdapter(recipe, host, options) {
       providerInstanceId: boundInstanceId,
       status: "ready",
       runtimeMode: input.runtimeMode,
+      nativeModeId: permissionMode,
       ...input.cwd ? { cwd: input.cwd } : {},
       ...modelSelection?.model ? { model: modelSelection.model } : {},
       resumeCursor: {
@@ -24796,6 +25283,7 @@ function createClaudeAdapter(recipe, host, options) {
       },
       promptQueue,
       query: queryRuntime,
+      stderrTail,
       streamFiber: void 0,
       startedAt,
       basePermissionMode: permissionMode,
@@ -24904,7 +25392,13 @@ function createClaudeAdapter(recipe, host, options) {
     }
     if (modelSelection?.model) {
       const turnCaps = claudeModelCapabilities(modelSelection.model, recipe.customModels);
-      const apiModelId = resolveClaudeApiModelId(turnCaps, { model: modelSelection.model });
+      const apiModelId = resolveClaudeApiModelId(turnCaps, {
+        model: claudeCliModelId({
+          boundModelId: modelSelection.model,
+          placeholder: CLAUDE_CARD.defaultModel,
+          customModels: recipe.customModels
+        })
+      });
       if (context.currentApiModelId !== apiModelId) {
         try {
           await context.query.setModel(apiModelId);
@@ -25002,7 +25496,7 @@ function createClaudeAdapter(recipe, host, options) {
         context.query.interrupt().then(() => settled.promise).then(() => {
           acknowledged = true;
         }),
-        new Promise((resolve2) => setTimeout(resolve2, CLAUDE_INTERRUPT_GRACE_MS))
+        new Promise((resolve3) => setTimeout(resolve3, CLAUDE_INTERRUPT_GRACE_MS))
       ]);
     } catch (cause) {
       throw toRequestError(threadId, "turn/interrupt", cause);
@@ -25037,22 +25531,49 @@ function createClaudeAdapter(recipe, host, options) {
     if (context.session.runtimeMode === runtimeMode) {
       return;
     }
-    const permissionMode = CLAUDE_PERMISSION_MODE_BY_RUNTIME_MODE[runtimeMode];
+    const permissionMode = claudePermissionModeFor(runtimeMode);
     context.basePermissionMode = permissionMode;
     context.session = {
       ...context.session,
       runtimeMode,
+      nativeModeId: permissionMode,
       updatedAt: nowIso()
     };
     if (context.currentPermissionMode !== "plan") {
       try {
-        await context.query.setPermissionMode(permissionMode ?? "default");
+        await context.query.setPermissionMode(permissionMode);
       } catch (cause) {
         throw toRequestError(threadId, "session/setPermissionMode", cause);
       }
       context.currentPermissionMode = permissionMode;
     }
-    if (runtimeMode !== "full-access") {
+    if (permissionMode !== "bypassPermissions") {
+      return;
+    }
+    for (const [requestId, pending] of context.pendingApprovals) {
+      context.pendingApprovals.delete(requestId);
+      pending.decision.resolve({ decision: "accept" });
+    }
+  };
+  const setNativeMode = async (threadId, nativeModeId) => {
+    const context = requireSession(threadId);
+    if (!isClaudeNativeModeId(nativeModeId)) return;
+    if (context.currentPermissionMode === nativeModeId) return;
+    context.basePermissionMode = nativeModeId;
+    context.session = {
+      ...context.session,
+      nativeModeId,
+      updatedAt: nowIso()
+    };
+    if (context.currentPermissionMode !== "plan" || nativeModeId === "plan") {
+      try {
+        await context.query.setPermissionMode(nativeModeId);
+      } catch (cause) {
+        throw toRequestError(threadId, "session/setPermissionMode", cause);
+      }
+      context.currentPermissionMode = nativeModeId;
+    }
+    if (nativeModeId !== "bypassPermissions") {
       return;
     }
     for (const [requestId, pending] of context.pendingApprovals) {
@@ -25085,6 +25606,7 @@ function createClaudeAdapter(recipe, host, options) {
     respondToRequest,
     respondToUserInput,
     setRuntimeMode,
+    setNativeMode,
     stopSession,
     events: runtimeEventQueue,
     dispose: async () => {
@@ -25095,12 +25617,19 @@ function createClaudeAdapter(recipe, host, options) {
     }
   };
 }
-function createClaudeInstance(config, host, attachments) {
+function claudeAdapterBaseEnvironment(recipe) {
+  return {
+    ...process.env,
+    ...withoutBrainSlots(recipe.environment, brainSlotEnvKeys3(CLAUDE_CARD))
+  };
+}
+function createClaudeInstance(config, host, attachments, pluginDataDirPath) {
   const recipe = parseClaudeInstanceConfig(config);
   const adapter = createClaudeAdapter(recipe, host, {
     instanceId: host.instanceId,
     ...attachments === void 0 ? {} : { attachments },
-    environment: { ...process.env, ...recipe.environment },
+    ...pluginDataDirPath === void 0 ? {} : { pluginDataDirPath },
+    environment: claudeAdapterBaseEnvironment(recipe),
     log: host.log
   });
   const collectProcessText = async (stream) => {
@@ -25111,6 +25640,15 @@ function createClaudeInstance(config, host, attachments) {
     return Buffer.concat(chunks).toString("utf8");
   };
   const probeAuth = () => {
+    const hasEnvToken = (recipe.environment.ANTHROPIC_AUTH_TOKEN ?? "").trim().length > 0;
+    const hasEnvApiKey = (recipe.environment.ANTHROPIC_API_KEY ?? "").trim().length > 0;
+    if (hasEnvToken || hasEnvApiKey) {
+      return {
+        status: "authenticated",
+        type: hasEnvToken ? "env-token" : "api-key",
+        label: hasEnvToken ? "ANTHROPIC_AUTH_TOKEN" : "ANTHROPIC_API_KEY"
+      };
+    }
     const account = readClaudeAccount(resolveClaudeCredentialsDirPath(recipe.credentialsPath));
     switch (account.state) {
       case "signed-in":
@@ -25147,6 +25685,10 @@ function createClaudeInstance(config, host, attachments) {
     ]);
     const version = parseGenericCliVersion(`${stdout}
 ${stderr}`);
+    const models = claudeProbeModels({
+      builtIn: getBuiltInClaudeModelsForVersion(version),
+      customModels: recipe.customModels
+    });
     const auth = probeAuth();
     if (exitCode !== 0 && version === null) {
       const detail = (stderr || stdout || "claude --version failed").trim();
@@ -25164,14 +25706,19 @@ ${stderr}`);
         version,
         readiness: "error",
         auth,
-        detail: "Claude is signed out"
+        models,
+        detail: "Claude is signed out",
+        // 退出登录了档位照样是那五档。不报就退回宿主四档，而那份映射少了 `plan`。
+        ...CLAUDE_NATIVE_MODE_REPORT
       };
     }
     return {
       installed: true,
       version,
       readiness: "ready",
-      auth
+      auth,
+      models,
+      ...CLAUDE_NATIVE_MODE_REPORT
     };
   };
   const resolveTranscriptRoots = (directory) => {
@@ -25182,7 +25729,7 @@ ${stderr}`);
     );
     return {
       configDir,
-      transcriptDir: NodePath6.join(configDir, "projects")
+      transcriptDir: NodePath7.join(configDir, "projects")
     };
   };
   return {
@@ -25193,12 +25740,13 @@ ${stderr}`);
     respondToRequest: adapter.respondToRequest,
     respondToUserInput: adapter.respondToUserInput,
     setRuntimeMode: adapter.setRuntimeMode,
+    setNativeMode: adapter.setNativeMode,
     compactContext: adapter.compactContext,
     stopSession: adapter.stopSession,
     readThread: adapter.readThread,
     events: adapter.events,
     dispose: adapter.dispose,
-    textGeneration: createClaudeTextGeneration(recipe, host),
+    textGeneration: createClaudeTextGeneration(recipe, host, pluginDataDirPath),
     sessions: {
       scan: async (input) => {
         const roots = resolveTranscriptRoots(input.directory);
@@ -25239,12 +25787,13 @@ ${stderr}`);
 
 // src/index.ts
 var capturedAttachments;
+var capturedDataDirPath;
 var executors = [
   {
     card: CLAUDE_CARD,
     createInstance: async (config, host) => {
       host.log.info("createInstance");
-      return createClaudeInstance(config, host, capturedAttachments);
+      return createClaudeInstance(config, host, capturedAttachments, capturedDataDirPath);
     }
   }
 ];
@@ -25254,6 +25803,7 @@ var index_default = definePlugin({
   executors,
   activate(ctx) {
     capturedAttachments = ctx.attachments;
+    capturedDataDirPath = ctx.paths.dataDir;
     ctx.log.info("claude executor ready");
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-claude",
-  "version": "0.2.2106",
+  "version": "0.2.2126",
   "description": "Claude executor: Claude Code CLI via @anthropic-ai/claude-agent-sdk.",
   "keywords": [
     "ycodium",
@@ -23,11 +23,11 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.2106"
+    "@ycodium-ai/plugin-api": "0.2.2126"
   },
   "ycodium": {
     "plugin": "./dist/index.js",
-    "displayName": "Claude",
+    "displayName": "Claude Code",
     "description": "Run Claude Code with in-session model and runtime-mode switching, native compaction, and session import.",
     "icon": "./assets/icon.svg",
     "permissions": [