claude-multi 0.6.4 → 0.7.0

package/dist/cli.js

@@ -7300,15 +7300,31 @@ function getApiKeyPlaceholder(providerName) {
   return prefix ? `${prefix}...` : "sk-...";
 }
 function providerHasRegions(providerName) {
-  return providerName === "mimo-token";
+  return providerName in PROVIDER_REGION_MAPS;
+}
+function getProviderRegions(providerName) {
+  return PROVIDER_REGION_MAPS[providerName];
+}
+function detectRegionFromBaseUrl(baseUrl) {
+  for (const regionMap of Object.values(PROVIDER_REGION_MAPS)) {
+    for (const [regionCode, config] of Object.entries(regionMap)) {
+      const escaped = config.baseUrl.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const regex = new RegExp(`^${escaped}/?$`);
+      if (regex.test(baseUrl)) {
+        return regionCode;
+      }
+    }
+  }
+  return null;
 }
 function resolveRegionTemplate(template, region) {
   if (!providerHasRegions(template.name)) {
     return template;
   }
-  const regionConfig = MIMO_TOKEN_REGIONS[region];
+  const regionMap = PROVIDER_REGION_MAPS[template.name];
+  const regionConfig = regionMap?.[region];
   if (!regionConfig) {
-    throw new Error(`Unknown region '${region}' for ${template.name}. Available: ${Object.keys(MIMO_TOKEN_REGIONS).join(", ")}`);
+    throw new Error(`Unknown region '${region}' for ${template.name}. Available: ${regionMap ? Object.keys(regionMap).join(", ") : "none"}`);
   }
   const resolved = structuredClone(template);
   resolved.settings.env.ANTHROPIC_BASE_URL = regionConfig.baseUrl;
@@ -7338,7 +7354,8 @@ function getProviderByBaseUrl(baseUrl) {
     if (baseUrl === templateUrl)
       return name;
   }
-  if (baseUrl.startsWith("https://token-plan-") && baseUrl.endsWith(".xiaomimimo.com/anthropic")) {
+  const regionCode = detectRegionFromBaseUrl(baseUrl);
+  if (regionCode) {
     return "mimo-token";
   }
   return null;
@@ -7357,7 +7374,7 @@ function detectProvider(configDir) {
     return null;
   }
 }
-var PROVIDER_COMMON_ENV, PROVIDER_TEMPLATES, API_KEY_PREFIXES, MIMO_TOKEN_REGIONS;
+var PROVIDER_COMMON_ENV, PROVIDER_TEMPLATES, API_KEY_PREFIXES, MIMO_TOKEN_REGIONS, PROVIDER_REGION_MAPS;
 var init_templates = __esm(() => {
   PROVIDER_COMMON_ENV = {};
   PROVIDER_TEMPLATES = {
@@ -7379,7 +7396,9 @@ var init_templates = __esm(() => {
           REASONING_EFFORT: "high",
           MAX_THINKING_TOKENS: "8000",
           ENABLE_STREAMING: "true",
-          MAX_OUTPUT_TOKENS: "64000"
+          MAX_OUTPUT_TOKENS: "64000",
+          CLAUDE_CODE_AUTO_COMPACT_WINDOW: "131072",
+          CLAUDE_AUTOCOMPACT_PCT_OVERRIDE: "75"
         },
         includeCoAuthoredBy: false,
         alwaysThinkingEnabled: false
@@ -7403,7 +7422,9 @@ var init_templates = __esm(() => {
           ENABLE_THINKING: "true",
           REASONING_EFFORT: "high",
           MAX_OUTPUT_TOKENS: "64000",
-          MAX_THINKING_TOKENS: "32000"
+          MAX_THINKING_TOKENS: "32000",
+          CLAUDE_CODE_AUTO_COMPACT_WINDOW: "131072",
+          CLAUDE_AUTOCOMPACT_PCT_OVERRIDE: "75"
         },
         includeCoAuthoredBy: false,
         alwaysThinkingEnabled: true
@@ -7493,7 +7514,9 @@ var init_templates = __esm(() => {
           ENABLE_THINKING: "true",
           REASONING_EFFORT: "high",
           MAX_THINKING_TOKENS: "16000",
-          MAX_OUTPUT_TOKENS: "65536"
+          MAX_OUTPUT_TOKENS: "65536",
+          CLAUDE_CODE_AUTO_COMPACT_WINDOW: "131072",
+          CLAUDE_AUTOCOMPACT_PCT_OVERRIDE: "75"
         },
         includeCoAuthoredBy: false,
         alwaysThinkingEnabled: false
@@ -7516,7 +7539,9 @@ var init_templates = __esm(() => {
           ENABLE_THINKING: "true",
           REASONING_EFFORT: "high",
           MAX_THINKING_TOKENS: "16000",
-          MAX_OUTPUT_TOKENS: "65536"
+          MAX_OUTPUT_TOKENS: "65536",
+          CLAUDE_CODE_AUTO_COMPACT_WINDOW: "131072",
+          CLAUDE_AUTOCOMPACT_PCT_OVERRIDE: "75"
         },
         includeCoAuthoredBy: false,
         alwaysThinkingEnabled: false
@@ -7539,7 +7564,9 @@ var init_templates = __esm(() => {
           ENABLE_THINKING: "true",
           REASONING_EFFORT: "high",
           MAX_THINKING_TOKENS: "16000",
-          MAX_OUTPUT_TOKENS: "65536"
+          MAX_OUTPUT_TOKENS: "65536",
+          CLAUDE_CODE_AUTO_COMPACT_WINDOW: "131072",
+          CLAUDE_AUTOCOMPACT_PCT_OVERRIDE: "75"
         },
         includeCoAuthoredBy: false,
         alwaysThinkingEnabled: false
@@ -7563,6 +7590,9 @@ var init_templates = __esm(() => {
       baseUrl: "https://token-plan-ams.xiaomimimo.com/anthropic"
     }
   };
+  PROVIDER_REGION_MAPS = {
+    "mimo-token": MIMO_TOKEN_REGIONS
+  };
 });
 
 // src/util/json-file.ts
@@ -7665,6 +7695,22 @@ var init_constants = __esm(() => {
   };
 });
 
+// src/constants/env.ts
+var TUNABLE_ENV_VARS;
+var init_env = __esm(() => {
+  TUNABLE_ENV_VARS = new Set([
+    "MAX_OUTPUT_TOKENS",
+    "MAX_THINKING_TOKENS",
+    "REASONING_EFFORT",
+    "ENABLE_THINKING",
+    "ENABLE_STREAMING",
+    "API_TIMEOUT_MS",
+    "CLAUDE_CODE_EFFORT_LEVEL",
+    "CLAUDE_CODE_AUTO_COMPACT_WINDOW",
+    "CLAUDE_AUTOCOMPACT_PCT_OVERRIDE"
+  ]);
+});
+
 // node_modules/semver/internal/constants.js
 var require_constants = __commonJS((exports, module) => {
   var SEMVER_SPEC_VERSION = "2.0.0";
@@ -9492,22 +9538,11 @@ var require_semver2 = __commonJS((exports, module) => {
 });
 
 // src/paths.ts
-var exports_paths = {};
-__export(exports_paths, {
-  getBaseDir: () => getBaseDir,
-  PINNED_CLAUDE_BIN: () => PINNED_CLAUDE_BIN,
-  PINNED_BIN_DIR: () => PINNED_BIN_DIR
-});
 import { homedir } from "node:os";
-import { join as join2 } from "node:path";
 function getBaseDir() {
   return process.env.CLAUDE_MULTI_HOME || homedir();
 }
-var PINNED_BIN_DIR, PINNED_CLAUDE_BIN;
-var init_paths = __esm(() => {
-  PINNED_BIN_DIR = join2(homedir(), ".claude-multi", "bin");
-  PINNED_CLAUDE_BIN = process.platform === "win32" ? join2(PINNED_BIN_DIR, "node_modules", ".bin", "claude.cmd") : join2(PINNED_BIN_DIR, "node_modules", ".bin", "claude");
-});
+var init_paths = () => {};
 
 // src/util/runtime.ts
 function detectPackageManager() {
@@ -9521,27 +9556,12 @@ function detectPackageManager() {
 }
 
 // src/version.ts
-var exports_version = {};
-__export(exports_version, {
-  upgradeClaudeMulti: () => upgradeClaudeMulti,
-  updateClaudeCode: () => updateClaudeCode,
-  isThirdPartyApiBroken: () => isThirdPartyApiBroken,
-  installPinnedClaude: () => installPinnedClaude,
-  getPinnedBinaryVersion: () => getPinnedBinaryVersion,
-  getLatestVersion: () => getLatestVersion,
-  getLatestClaudeMultiVersion: () => getLatestClaudeMultiVersion,
-  getCurrentVersion: () => getCurrentVersion,
-  getClaudeMultiVersion: () => getClaudeMultiVersion,
-  checkForUpdates: () => checkForUpdates,
-  checkForClaudeMultiUpdates: () => checkForClaudeMultiUpdates,
-  COMPATIBLE_CLAUDE_VERSION: () => COMPATIBLE_CLAUDE_VERSION
-});
 import { execSync } from "node:child_process";
-import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync, mkdirSync } from "node:fs";
-import { join as join3, dirname } from "node:path";
+import { readFileSync as readFileSync2 } from "node:fs";
+import { join as join2, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 function getClaudeMultiVersion() {
-  const pkgPath = join3(dirname(fileURLToPath(import.meta.url)), "..", "package.json");
+  const pkgPath = join2(dirname(fileURLToPath(import.meta.url)), "..", "package.json");
   const pkg = JSON.parse(readFileSync2(pkgPath, "utf-8"));
   if (typeof pkg !== "object" || pkg === null || typeof pkg.version !== "string") {
     throw new ClaudeMultiError(ErrorCode.CONFIG_CORRUPTED, "Could not read package version");
@@ -9601,40 +9621,6 @@ function getCurrentVersion() {
     return null;
   }
 }
-function isThirdPartyApiBroken(version) {
-  return import_semver.default.gte(version, "2.1.154") && import_semver.default.lt(version, "2.1.156");
-}
-function getPinnedBinaryVersion() {
-  const pkgJsonPath = join3(PINNED_BIN_DIR, "node_modules", "@anthropic-ai", "claude-code", "package.json");
-  try {
-    if (!existsSync2(pkgJsonPath))
-      return null;
-    const pkg = JSON.parse(readFileSync2(pkgJsonPath, "utf-8"));
-    return pkg.version ?? null;
-  } catch {
-    return null;
-  }
-}
-function installPinnedClaude() {
-  const pm = detectPackageManager();
-  mkdirSync(PINNED_BIN_DIR, { recursive: true });
-  const pkgJsonPath = join3(PINNED_BIN_DIR, "package.json");
-  if (!existsSync2(pkgJsonPath)) {
-    writeFileSync(pkgJsonPath, JSON.stringify({ dependencies: {} }, null, 2));
-  }
-  const pkg = `@anthropic-ai/claude-code@${COMPATIBLE_CLAUDE_VERSION}`;
-  const commands = {
-    bun: `bun add --cwd ${PINNED_BIN_DIR} ${pkg}`,
-    npm: `npm install --prefix ${PINNED_BIN_DIR} ${pkg}`,
-    pnpm: `pnpm add --dir ${PINNED_BIN_DIR} ${pkg}`,
-    deno: `cd ${PINNED_BIN_DIR} && npm install ${pkg}`
-  };
-  try {
-    execSync(commands[pm], { stdio: "inherit" });
-  } catch (err) {
-    throw new ClaudeMultiError(ErrorCode.UPDATE_FAILED, `Failed to install pinned Claude v${COMPATIBLE_CLAUDE_VERSION}: ${err instanceof Error ? err.message : String(err)}`, { cause: err });
-  }
-}
 async function getLatestVersion() {
   try {
     const response = await fetch("https://registry.npmjs.org/@anthropic-ai/claude-code/latest");
@@ -9669,20 +9655,15 @@ function updateClaudeCode() {
     throw new ClaudeMultiError(ErrorCode.UPDATE_FAILED, `Failed to update @anthropic-ai/claude-code: ${err instanceof Error ? err.message : String(err)}`, { cause: err });
   }
 }
-var import_semver, COMPATIBLE_CLAUDE_VERSION = "2.1.156";
 var init_version = __esm(() => {
   init_errors();
-  init_paths();
-  import_semver = __toESM(require_semver2(), 1);
 });
 
 // src/wrapper.ts
 var exports_wrapper = {};
 __export(exports_wrapper, {
-  tryGetGlobalClaudePath: () => tryGetGlobalClaudePath,
   tryGetClaudePath: () => tryGetClaudePath,
   removeWrapper: () => removeWrapper,
-  getGlobalClaudePath: () => getGlobalClaudePath,
   getDefaultBinaryPath: () => getDefaultBinaryPath,
   getClaudePath: () => getClaudePath,
   generateWrapperScriptSafe: () => generateWrapperScriptSafe,
@@ -9691,7 +9672,7 @@ __export(exports_wrapper, {
   createWrapper: () => createWrapper,
   buildWrapperScript: () => buildWrapperScript
 });
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, chmodSync, unlinkSync } from "node:fs";
+import { existsSync as existsSync2, mkdirSync, chmodSync, unlinkSync } from "node:fs";
 import { writeFile as writeFile2 } from "node:fs/promises";
 import { resolve, dirname as dirname2 } from "node:path";
 import { execSync as execSync2 } from "node:child_process";
@@ -9699,19 +9680,15 @@ function getClaudePath() {
   const override = process.env.CLAUDE_MULTI_CLAUDE_PATH;
   if (override) {
     const resolved = resolve(override);
-    if (!existsSync3(resolved)) {
+    if (!existsSync2(resolved)) {
       throw new ClaudeMultiError(ErrorCode.CLAUDE_NOT_FOUND, `CLAUDE_MULTI_CLAUDE_PATH points to ${resolved} but that file does not exist`);
     }
     return resolved;
   }
-  if (existsSync3(PINNED_CLAUDE_BIN)) {
-    return PINNED_CLAUDE_BIN;
-  }
   try {
     const command = process.platform === "win32" ? "where claude" : "which claude";
     const claudePath = execSync2(command, { encoding: "utf-8" }).trim();
-    const firstPath = claudePath.split(`
-`)[0];
+    const firstPath = claudePath.split(/\r?\n/)[0];
     if (!firstPath) {
       throw new ClaudeMultiError(ErrorCode.CLAUDE_NOT_FOUND, "Could not determine Claude path");
     }
@@ -9729,37 +9706,6 @@ function tryGetClaudePath() {
     return null;
   }
 }
-function getGlobalClaudePath() {
-  const override = process.env.CLAUDE_MULTI_CLAUDE_PATH;
-  if (override) {
-    const resolved = resolve(override);
-    if (!existsSync3(resolved)) {
-      throw new ClaudeMultiError(ErrorCode.CLAUDE_NOT_FOUND, `CLAUDE_MULTI_CLAUDE_PATH points to ${resolved} but that file does not exist`);
-    }
-    return resolved;
-  }
-  try {
-    const command = process.platform === "win32" ? "where claude" : "which claude";
-    const claudePath = execSync2(command, { encoding: "utf-8" }).trim();
-    const firstPath = claudePath.split(`
-`)[0];
-    if (!firstPath) {
-      throw new ClaudeMultiError(ErrorCode.CLAUDE_NOT_FOUND, "Could not determine Claude path");
-    }
-    return firstPath.trim();
-  } catch (err) {
-    if (err instanceof ClaudeMultiError)
-      throw err;
-    throw new ClaudeMultiError(ErrorCode.CLAUDE_NOT_FOUND, "Claude Code is not installed. Please install @anthropic-ai/claude-code first.", { cause: err });
-  }
-}
-function tryGetGlobalClaudePath() {
-  try {
-    return getGlobalClaudePath();
-  } catch {
-    return null;
-  }
-}
 function generateWrapperScriptSafe(options) {
   const claudePath = tryGetClaudePath();
   if (!claudePath)
@@ -9791,11 +9737,11 @@ set "CLAUDE_CONFIG_DIR=${options.configDir}"
 async function createWrapper(options) {
   const { binaryPath, configDir } = options;
   const binDir = dirname2(binaryPath);
-  if (!existsSync3(binDir)) {
-    mkdirSync2(binDir, { recursive: true });
+  if (!existsSync2(binDir)) {
+    mkdirSync(binDir, { recursive: true });
   }
-  if (!existsSync3(configDir)) {
-    mkdirSync2(configDir, { recursive: true });
+  if (!existsSync2(configDir)) {
+    mkdirSync(configDir, { recursive: true });
   }
   if (process.platform === "win32") {
     const script = generateWindowsWrapperScript(options);
@@ -9807,7 +9753,7 @@ async function createWrapper(options) {
   }
 }
 function removeWrapper(binaryPath) {
-  if (existsSync3(binaryPath)) {
+  if (existsSync2(binaryPath)) {
     unlinkSync(binaryPath);
   }
 }
@@ -9832,7 +9778,6 @@ function getDefaultBinaryPath(name) {
 }
 var init_wrapper = __esm(() => {
   init_errors();
-  init_paths();
 });
 
 // src/migration.ts
@@ -9849,11 +9794,11 @@ __export(exports_migration, {
   LEGACY_INSTANCE_VERSION: () => LEGACY_INSTANCE_VERSION,
   CONFIG_VERSION: () => CONFIG_VERSION
 });
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync, copyFileSync, readFileSync as readFileSync3, rmSync, writeFileSync as writeFileSync2, chmodSync as chmodSync2 } from "node:fs";
-import { join as join4, dirname as dirname3 } from "node:path";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readdirSync, copyFileSync, readFileSync as readFileSync3, rmSync, writeFileSync, chmodSync as chmodSync2 } from "node:fs";
+import { join as join3, dirname as dirname3 } from "node:path";
 function updateClaudeJson(configDir) {
-  const stateFile = join4(configDir, ".claude.json");
-  if (!existsSync4(stateFile))
+  const stateFile = join3(configDir, ".claude.json");
+  if (!existsSync3(stateFile))
     return;
   try {
     const raw = JSON.parse(readFileSync3(stateFile, "utf-8"));
@@ -9863,7 +9808,7 @@ function updateClaudeJson(configDir) {
       changed = true;
     }
     if (changed) {
-      writeFileSync2(stateFile, JSON.stringify(raw, null, 2), "utf-8");
+      writeFileSync(stateFile, JSON.stringify(raw, null, 2), "utf-8");
     }
   } catch {}
 }
@@ -9872,10 +9817,10 @@ function needsInstanceMigration(config) {
   const stored = config.instanceMigrationVersion;
   if (!stored)
     return INSTANCE_MIGRATIONS.length > 0;
-  const storedCoerced = import_semver2.default.coerce(stored);
+  const storedCoerced = import_semver.default.coerce(stored);
   if (!storedCoerced)
     return INSTANCE_MIGRATIONS.length > 0;
-  return INSTANCE_MIGRATIONS.some((m) => import_semver2.default.gt(m.version, storedCoerced) && import_semver2.default.lte(m.version, current));
+  return INSTANCE_MIGRATIONS.some((m) => import_semver.default.gt(m.version, storedCoerced) && import_semver.default.lte(m.version, current));
 }
 async function runInstanceMigrations(config) {
   if (!needsInstanceMigration(config))
@@ -9885,8 +9830,8 @@ async function runInstanceMigrations(config) {
   try {
     createBackup(config);
     const currentVersion = getClaudeMultiVersion();
-    const stored = import_semver2.default.coerce(config.instanceMigrationVersion || "0.0.0");
-    const applicable = INSTANCE_MIGRATIONS.filter((m) => stored ? import_semver2.default.gt(m.version, stored) && import_semver2.default.lte(m.version, currentVersion) : true).toSorted((a, b) => import_semver2.default.compare(a.version, b.version));
+    const stored = import_semver.default.coerce(config.instanceMigrationVersion || "0.0.0");
+    const applicable = INSTANCE_MIGRATIONS.filter((m) => stored ? import_semver.default.gt(m.version, stored) && import_semver.default.lte(m.version, currentVersion) : true).toSorted((a, b) => import_semver.default.compare(a.version, b.version));
     for (const migration of applicable) {
       for (let i = 0;i < config.instances.length; i++) {
         const migrated = await migration.migrate({ ...config.instances[i] }, config);
@@ -9900,26 +9845,31 @@ async function runInstanceMigrations(config) {
   }
 }
 function getBackupDir() {
-  return join4(getBaseDir(), ".claude-multi", "backups");
+  return join3(getBaseDir(), ".claude-multi", "backups");
 }
 function getLockFile() {
-  return join4(getBaseDir(), ".claude-multi", ".migration.lock");
+  return join3(getBaseDir(), ".claude-multi", ".migration.lock");
 }
 function createLock() {
   const lockFile = getLockFile();
   const lockDir = dirname3(lockFile);
-  if (!existsSync4(lockDir))
-    mkdirSync3(lockDir, { recursive: true });
-  if (existsSync4(lockFile)) {
+  if (!existsSync3(lockDir))
+    mkdirSync2(lockDir, { recursive: true });
+  if (existsSync3(lockFile)) {
     try {
       const raw = JSON.parse(readFileSync3(lockFile, "utf-8"));
       if (typeof raw === "object" && raw !== null && "pid" in raw && typeof raw.pid === "number") {
         const lock = raw;
-        try {
-          process.kill(lock.pid, 0);
-          return false;
-        } catch {
+        const lockAge = Date.now() - new Date(lock.startedAt).getTime();
+        if (lockAge > 30 * 60 * 1000) {
           rmSync(lockFile, { force: true });
+        } else {
+          try {
+            process.kill(lock.pid, 0);
+            return false;
+          } catch {
+            rmSync(lockFile, { force: true });
+          }
         }
       } else {
         rmSync(lockFile, { force: true });
@@ -9928,7 +9878,7 @@ function createLock() {
       rmSync(lockFile, { force: true });
     }
   }
-  writeFileSync2(lockFile, JSON.stringify({
+  writeFileSync(lockFile, JSON.stringify({
     pid: process.pid,
     startedAt: new Date().toISOString()
   }), "utf-8");
@@ -9953,30 +9903,30 @@ function clearMigrationFailure(config) {
 }
 function createBackup(config) {
   const backupDir = getBackupDir();
-  if (!existsSync4(backupDir)) {
-    mkdirSync3(backupDir, { recursive: true });
+  if (!existsSync3(backupDir)) {
+    mkdirSync2(backupDir, { recursive: true });
   }
   const ts = new Date().toISOString().replace(/[:.]/g, "-");
   const rand = Math.random().toString(36).slice(2, 6);
   const fromV = config.version || "1.0.0";
-  const backupPath = join4(backupDir, `${ts}-${rand}-v${fromV}-to-v${CONFIG_VERSION}`);
-  mkdirSync3(backupPath, { recursive: true });
-  const configSrc = join4(getBaseDir(), ".claude-multi", "config.json");
-  if (existsSync4(configSrc)) {
-    copyFileSync(configSrc, join4(backupPath, "config.json"));
+  const backupPath = join3(backupDir, `${ts}-${rand}-v${fromV}-to-v${CONFIG_VERSION}`);
+  mkdirSync2(backupPath, { recursive: true });
+  const configSrc = join3(getBaseDir(), ".claude-multi", "config.json");
+  if (existsSync3(configSrc)) {
+    copyFileSync(configSrc, join3(backupPath, "config.json"));
   }
-  const instancesDir = join4(backupPath, "instances");
+  const instancesDir = join3(backupPath, "instances");
   for (const inst of config.instances) {
-    const settingsFile = join4(inst.configDir, "settings.json");
-    if (existsSync4(settingsFile)) {
-      const instDir = join4(instancesDir, inst.name);
-      mkdirSync3(instDir, { recursive: true });
-      copyFileSync(settingsFile, join4(instDir, "settings.json"));
+    const settingsFile = join3(inst.configDir, "settings.json");
+    if (existsSync3(settingsFile)) {
+      const instDir = join3(instancesDir, inst.name);
+      mkdirSync2(instDir, { recursive: true });
+      copyFileSync(settingsFile, join3(instDir, "settings.json"));
     }
   }
   const backups = readdirSync(backupDir).toSorted();
   for (let i = 0;i < backups.length - 3; i++) {
-    rmSync(join4(backupDir, backups[i]), { force: true, recursive: true });
+    rmSync(join3(backupDir, backups[i]), { force: true, recursive: true });
   }
   return backupPath;
 }
@@ -9994,7 +9944,7 @@ function runMigration(config) {
       if (!inst.name || !inst.configDir || !inst.binaryPath) {
         warnings.push(`Instance entry missing required fields, skipping: ${JSON.stringify(inst)}`);
       }
-      if (inst.configDir && !existsSync4(inst.configDir)) {
+      if (inst.configDir && !existsSync3(inst.configDir)) {
         warnings.push(`Instance '${inst.name}' configDir does not exist: ${inst.configDir}`);
       }
     }
@@ -10027,18 +9977,19 @@ function getMigrationStatus(config) {
 }
 function listBackups() {
   const backupDir = getBackupDir();
-  if (!existsSync4(backupDir))
+  if (!existsSync3(backupDir))
     return [];
   return readdirSync(backupDir).toSorted().toReversed();
 }
-var import_semver2, CONFIG_VERSION = "2.0.0", LEGACY_INSTANCE_VERSION = "0.5", INSTANCE_MIGRATIONS;
+var import_semver, CONFIG_VERSION = "2.0.0", LEGACY_INSTANCE_VERSION = "0.5", INSTANCE_MIGRATIONS;
 var init_migration = __esm(() => {
   init_paths();
   init_constants();
   init_version();
+  init_env();
   init_wrapper();
   init_templates();
-  import_semver2 = __toESM(require_semver2(), 1);
+  import_semver = __toESM(require_semver2(), 1);
   INSTANCE_MIGRATIONS = [
     {
       version: "0.6.2",
@@ -10048,17 +9999,19 @@ var init_migration = __esm(() => {
         if (instance.createdWithVersion && instance.createdWithVersion !== LEGACY_INSTANCE_VERSION && instance.createdWithVersion === currentVersion) {
           return Promise.resolve(instance);
         }
-        if (existsSync4(instance.binaryPath)) {
-          const claudePath = tryGetGlobalClaudePath();
+        if (existsSync3(instance.binaryPath)) {
+          const claudePath = tryGetClaudePath();
           if (claudePath !== null) {
             const expected = buildWrapperScript(instance, claudePath);
             try {
               const current = readFileSync3(instance.binaryPath, "utf-8");
               if (current !== expected) {
-                writeFileSync2(instance.binaryPath, expected, { mode: 493 });
+                writeFileSync(instance.binaryPath, expected, { mode: 493 });
                 chmodSync2(instance.binaryPath, 493);
               }
             } catch {}
+          } else {
+            console.warn(`[migration] Could not find claude binary, skipping wrapper regeneration for instance: ${instance.name}`);
           }
         }
         updateClaudeJson(instance.configDir);
@@ -10069,28 +10022,53 @@ var init_migration = __esm(() => {
       version: "0.6.3",
       description: "Sync provider template env vars (model names, thinking/output limits) to latest",
       migrate: (instance) => {
+        const currentVersion = getClaudeMultiVersion();
+        if (instance.createdWithVersion && instance.createdWithVersion !== LEGACY_INSTANCE_VERSION && instance.createdWithVersion === currentVersion) {
+          return Promise.resolve(instance);
+        }
         const providerName = instance.providerTemplate ?? detectProvider(instance.configDir);
         if (!providerName)
           return Promise.resolve(instance);
-        const template = getProviderTemplate(providerName);
+        let template = getProviderTemplate(providerName);
         if (!template)
           return Promise.resolve(instance);
-        const settingsFile = join4(instance.configDir, "settings.json");
+        const settingsFile = join3(instance.configDir, "settings.json");
         try {
-          if (!existsSync4(settingsFile))
+          if (!existsSync3(settingsFile))
             return Promise.resolve(instance);
           const existing = JSON.parse(readFileSync3(settingsFile, "utf-8"));
           const existingEnv = existing.env ?? {};
           const apiKey = existingEnv.ANTHROPIC_AUTH_TOKEN ?? "";
+          const existingBaseUrl = existingEnv.ANTHROPIC_BASE_URL;
+          let resolvedRegional = false;
+          if (providerHasRegions(providerName)) {
+            const providerRegions = getProviderRegions(providerName);
+            const detectedRegion = detectRegionFromBaseUrl(existingBaseUrl ?? "") ?? instance.providerRegion;
+            if (detectedRegion && providerRegions && detectedRegion in providerRegions) {
+              template = resolveRegionTemplate(template, detectedRegion);
+              instance.providerRegion = detectedRegion;
+              resolvedRegional = true;
+            }
+          }
           const templateSettings = structuredClone(template.settings);
           const newEnv = { ...templateSettings.env, ANTHROPIC_AUTH_TOKEN: apiKey };
+          if (providerHasRegions(providerName) && !resolvedRegional && existingBaseUrl) {
+            newEnv.ANTHROPIC_BASE_URL = existingBaseUrl;
+          }
+          for (const key of TUNABLE_ENV_VARS) {
+            if (key in existingEnv && existingEnv[key] !== templateSettings.env[key]) {
+              newEnv[key] = existingEnv[key];
+            }
+          }
           existing.env = { ...existingEnv, ...newEnv };
           existing.includeCoAuthoredBy = template.settings.includeCoAuthoredBy;
           existing.alwaysThinkingEnabled = template.settings.alwaysThinkingEnabled;
-          writeFileSync2(settingsFile, JSON.stringify(existing, null, 2), "utf-8");
-        } catch {}
-        if (!instance.providerTemplate) {
-          instance.providerTemplate = providerName;
+          writeFileSync(settingsFile, JSON.stringify(existing, null, 2), "utf-8");
+          if (!instance.providerTemplate) {
+            instance.providerTemplate = providerName;
+          }
+        } catch (err) {
+          console.warn(`[migration] Failed to sync provider template for '${instance.name}': ${err instanceof Error ? err.message : String(err)}`);
         }
         return Promise.resolve(instance);
       }
@@ -10105,6 +10083,7 @@ __export(exports_config, {
   validatePluginOperation: () => validatePluginOperation,
   updateInstanceAutoSync: () => updateInstanceAutoSync,
   unsyncPluginsAndSkills: () => unsyncPluginsAndSkills,
+  syncProviderTemplateForInstance: () => syncProviderTemplateForInstance,
   syncPluginsAndSkills: () => syncPluginsAndSkills,
   setTestDefaultClaudeDir: () => setTestDefaultClaudeDir,
   setTestConfigDir: () => setTestConfigDir,
@@ -10151,11 +10130,11 @@ __export(exports_config, {
   clearTestConfigDir: () => clearTestConfigDir,
   addInstance: () => addInstance
 });
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readdirSync as readdirSync2, statSync, readlinkSync, rmSync as rmSync2, lstatSync, readFileSync as readFileSync4, renameSync } from "node:fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync as readdirSync2, statSync, readlinkSync, rmSync as rmSync2, lstatSync, readFileSync as readFileSync4, writeFileSync as writeFileSync2, renameSync } from "node:fs";
 import { readFile as readFile2, writeFile as writeFile3, copyFile, mkdir, symlink } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import { randomBytes as randomBytes2 } from "node:crypto";
-import { dirname as dirname4, isAbsolute, join as join5, relative, resolve as resolve2 } from "node:path";
+import { dirname as dirname4, isAbsolute, join as join4, relative, resolve as resolve2 } from "node:path";
 function setTestConfigDir(dir) {
   _testConfigDir = dir;
 }
@@ -10163,19 +10142,19 @@ function clearTestConfigDir() {
   _testConfigDir = undefined;
 }
 function getConfigDir() {
-  return _testConfigDir ?? join5(homedir2(), ".claude-multi");
+  return _testConfigDir ?? join4(homedir2(), ".claude-multi");
 }
 function getConfigFile() {
-  return join5(getConfigDir(), "config.json");
+  return join4(getConfigDir(), "config.json");
 }
 async function copyDirRecursive(source, target) {
-  if (!existsSync5(target)) {
+  if (!existsSync4(target)) {
     await mkdir(target, { recursive: true });
   }
   const entries = readdirSync2(source);
   await Promise.all(entries.map(async (entry) => {
-    const src = join5(source, entry);
-    const tgt = join5(target, entry);
+    const src = join4(source, entry);
+    const tgt = join4(target, entry);
     const s = statSync(src);
     if (s.isDirectory()) {
       await copyDirRecursive(src, tgt);
@@ -10192,8 +10171,8 @@ function lstatSafe(path) {
   }
 }
 function ensureConfigDir() {
-  if (!existsSync5(getConfigDir())) {
-    mkdirSync4(getConfigDir(), { recursive: true });
+  if (!existsSync4(getConfigDir())) {
+    mkdirSync3(getConfigDir(), { recursive: true });
   }
 }
 function isConfig(raw) {
@@ -10201,7 +10180,7 @@ function isConfig(raw) {
 }
 async function loadConfig() {
   ensureConfigDir();
-  if (!existsSync5(getConfigFile())) {
+  if (!existsSync4(getConfigFile())) {
     const defaultConfig = {
       instances: [],
       version: "2.0.0"
@@ -10297,7 +10276,7 @@ function getDefaultClaudeDir() {
   if (_testDefaultClaudeDir) {
     return _testDefaultClaudeDir;
   }
-  return join5(homedir2(), ".claude");
+  return join4(homedir2(), ".claude");
 }
 function isBrokenSymlink(path) {
   try {
@@ -10313,7 +10292,7 @@ function isBrokenSymlink(path) {
     } else {
       targetPath = resolve2(dirname4(path), target);
     }
-    return !existsSync5(targetPath);
+    return !existsSync4(targetPath);
   } catch {
     return false;
   }
@@ -10321,7 +10300,7 @@ function isBrokenSymlink(path) {
 function detectBrokenSymlinks(configDir) {
   const result = { broken: [], all: [] };
   for (const dir of SYNC_DIRS) {
-    const targetPath = join5(configDir, dir);
+    const targetPath = join4(configDir, dir);
     try {
       const stats = lstatSync(targetPath);
       result.all.push(dir);
@@ -10334,13 +10313,13 @@ function detectBrokenSymlinks(configDir) {
 }
 function hasDefaultClaudeConfig() {
   const defaultDir = getDefaultClaudeDir();
-  const settingsFile = join5(defaultDir, "settings.json");
-  return existsSync5(defaultDir) && existsSync5(settingsFile);
+  const settingsFile = join4(defaultDir, "settings.json");
+  return existsSync4(defaultDir) && existsSync4(settingsFile);
 }
 async function copySettingsFromDefault(targetConfigDir) {
   const defaultDir = getDefaultClaudeDir();
-  const sourceSettings = join5(defaultDir, "settings.json");
-  if (!existsSync5(sourceSettings)) {
+  const sourceSettings = join4(defaultDir, "settings.json");
+  if (!existsSync4(sourceSettings)) {
     throw new ClaudeMultiError(ErrorCode.DEFAULT_SETTINGS_NOT_FOUND, "Default Claude settings.json not found");
   }
   const content = await readFile2(sourceSettings, "utf-8");
@@ -10356,18 +10335,18 @@ async function copySettingsFromDefault(targetConfigDir) {
       safeSettings[key] = settings[key];
     }
   }
-  if (!existsSync5(targetConfigDir)) {
+  if (!existsSync4(targetConfigDir)) {
     await mkdir(targetConfigDir, { recursive: true });
   }
-  const targetSettings = join5(targetConfigDir, "settings.json");
+  const targetSettings = join4(targetConfigDir, "settings.json");
   await writeFile3(targetSettings, JSON.stringify(safeSettings, null, 2), "utf-8");
 }
 async function copyAllFromDefault(targetConfigDir, autoSync = false) {
   const defaultDir = getDefaultClaudeDir();
-  if (!existsSync5(defaultDir)) {
+  if (!existsSync4(defaultDir)) {
     throw new ClaudeMultiError(ErrorCode.DEFAULT_DIR_NOT_FOUND, "Default Claude directory not found");
   }
-  if (!existsSync5(targetConfigDir)) {
+  if (!existsSync4(targetConfigDir)) {
     await mkdir(targetConfigDir, { recursive: true });
   }
   const excludeFiles = [
@@ -10390,8 +10369,8 @@ async function copyAllFromDefault(targetConfigDir, autoSync = false) {
   const copyRecursive = async (source, target) => {
     const entries = readdirSync2(source);
     for (const entry of entries) {
-      const sourcePath = join5(source, entry);
-      const targetPath = join5(target, entry);
+      const sourcePath = join4(source, entry);
+      const targetPath = join4(target, entry);
       const stat = statSync(sourcePath);
       if (excludeSet.has(entry)) {
         continue;
@@ -10415,7 +10394,7 @@ async function copyAllFromDefault(targetConfigDir, autoSync = false) {
           await symlink(sourcePath, targetPath, "dir");
           console.log(`  Symlinked: ${entry} -> ${sourcePath}`);
         } else {
-          if (!existsSync5(targetPath)) {
+          if (!existsSync4(targetPath)) {
             await mkdir(targetPath, { recursive: true });
           }
           await copyRecursive(sourcePath, targetPath);
@@ -10428,11 +10407,11 @@ async function copyAllFromDefault(targetConfigDir, autoSync = false) {
   await copyRecursive(defaultDir, targetConfigDir);
 }
 async function detectMcpConfigurations(configDir) {
-  if (!existsSync5(configDir)) {
+  if (!existsSync4(configDir)) {
     return null;
   }
-  const settingsFile = join5(configDir, "settings.json");
-  if (existsSync5(settingsFile)) {
+  const settingsFile = join4(configDir, "settings.json");
+  if (existsSync4(settingsFile)) {
     try {
       const settingsContent = await readFile2(settingsFile, "utf-8");
       const settings = JSON.parse(settingsContent);
@@ -10443,8 +10422,8 @@ async function detectMcpConfigurations(configDir) {
   }
   const mcpFiles = ["mcp.json", "mcp-servers.json", "claude-mcp.json"];
   for (const mcpFile of mcpFiles) {
-    const mcpFilePath = join5(configDir, mcpFile);
-    if (existsSync5(mcpFilePath)) {
+    const mcpFilePath = join4(configDir, mcpFile);
+    if (existsSync4(mcpFilePath)) {
       try {
         const mcpContent = await readFile2(mcpFilePath, "utf-8");
         const mcpConfig = JSON.parse(mcpContent);
@@ -10463,12 +10442,12 @@ async function hasDefaultMcpConfig() {
 }
 async function copyMcpServersFromDefault(targetConfigDir) {
   const defaultDir = getDefaultClaudeDir();
-  if (!existsSync5(targetConfigDir)) {
+  if (!existsSync4(targetConfigDir)) {
     await mkdir(targetConfigDir, { recursive: true });
   }
-  const pluginsDir = join5(targetConfigDir, "plugins");
-  const defaultPluginsDir = join5(defaultDir, "plugins");
-  if (existsSync5(defaultPluginsDir) && !existsSync5(pluginsDir)) {
+  const pluginsDir = join4(targetConfigDir, "plugins");
+  const defaultPluginsDir = join4(defaultDir, "plugins");
+  if (existsSync4(defaultPluginsDir) && !existsSync4(pluginsDir)) {
     await copyDirRecursive(defaultPluginsDir, pluginsDir);
   }
   const mcpConfig = await detectMcpConfigurations(defaultDir);
@@ -10488,8 +10467,8 @@ async function copyMcpServersFromDefault(targetConfigDir) {
   }
 }
 async function writeMcpConfiguration(targetConfigDir, mcpConfig) {
-  const settingsFile = join5(targetConfigDir, "settings.json");
-  if (existsSync5(settingsFile)) {
+  const settingsFile = join4(targetConfigDir, "settings.json");
+  if (existsSync4(settingsFile)) {
     try {
       const settingsContent = await readFile2(settingsFile, "utf-8");
       const settings = JSON.parse(settingsContent);
@@ -10498,7 +10477,7 @@ async function writeMcpConfiguration(targetConfigDir, mcpConfig) {
       return;
     } catch {}
   }
-  const mcpFile = join5(targetConfigDir, "mcp.json");
+  const mcpFile = join4(targetConfigDir, "mcp.json");
   await writeFile3(mcpFile, JSON.stringify(mcpConfig, null, 2), "utf-8");
 }
 async function copyMcpServersBetweenInstances(sourceInstanceName, targetInstanceName) {
@@ -10527,18 +10506,18 @@ async function listMcpServers(instanceName) {
   return mcpConfig?.mcpServers || null;
 }
 async function createSettingsFromTemplate(targetConfigDir, template, apiKey) {
-  if (!existsSync5(targetConfigDir)) {
+  if (!existsSync4(targetConfigDir)) {
     await mkdir(targetConfigDir, { recursive: true });
   }
   const settings = applyProviderTemplate(template, apiKey);
-  const settingsFile = join5(targetConfigDir, "settings.json");
+  const settingsFile = join4(targetConfigDir, "settings.json");
   await writeFile3(settingsFile, JSON.stringify(settings, null, 2), "utf-8");
 }
 async function initializeInstanceState(configDir) {
-  const stateFile = join5(configDir, ".claude.json");
-  if (existsSync5(stateFile))
+  const stateFile = join4(configDir, ".claude.json");
+  if (existsSync4(stateFile))
     return;
-  if (!existsSync5(configDir)) {
+  if (!existsSync4(configDir)) {
     await mkdir(configDir, { recursive: true });
   }
   const state = {
@@ -10561,9 +10540,9 @@ async function initializeInstanceState(configDir) {
   await writeFile3(stateFile, JSON.stringify(state, null, 2), "utf-8");
 }
 async function mergeProviderEnv(configDir, template, apiKey) {
-  const settingsFile = join5(configDir, "settings.json");
+  const settingsFile = join4(configDir, "settings.json");
   let existing = {};
-  if (existsSync5(settingsFile)) {
+  if (existsSync4(settingsFile)) {
     const raw = await readFile2(settingsFile, "utf-8");
     existing = JSON.parse(raw);
   }
@@ -10573,22 +10552,81 @@ async function mergeProviderEnv(configDir, template, apiKey) {
   existing.includeCoAuthoredBy = template.settings.includeCoAuthoredBy;
   await writeFile3(settingsFile, JSON.stringify(existing, null, 2), "utf-8");
 }
+async function syncProviderTemplateForInstance(instance) {
+  const providerName = instance.providerTemplate ?? detectProvider(instance.configDir);
+  if (!providerName) {
+    throw new ClaudeMultiError(ErrorCode.INSTANCE_NOT_FOUND, `Could not detect provider for '${instance.name}'`);
+  }
+  let template = getProviderTemplate(providerName);
+  if (!template) {
+    throw new ClaudeMultiError(ErrorCode.INSTANCE_NOT_FOUND, `Unknown provider template '${providerName}'`);
+  }
+  const settingsFile = join4(instance.configDir, "settings.json");
+  if (!existsSync4(settingsFile)) {
+    throw new ClaudeMultiError(ErrorCode.INSTANCE_DIR_NOT_FOUND, `No settings.json found for '${instance.name}'`);
+  }
+  const raw = JSON.parse(readFileSync4(settingsFile, "utf-8"));
+  const existingEnv = raw.env ?? {};
+  const apiKey = existingEnv.ANTHROPIC_AUTH_TOKEN ?? "";
+  const existingBaseUrl = existingEnv.ANTHROPIC_BASE_URL;
+  let resolvedRegion = null;
+  if (providerHasRegions(providerName)) {
+    const detectedRegion = existingBaseUrl ? detectRegionFromBaseUrl(existingBaseUrl) ?? instance.providerRegion : instance.providerRegion;
+    if (detectedRegion) {
+      const providerRegions = getProviderRegions(providerName);
+      if (providerRegions && detectedRegion in providerRegions) {
+        template = resolveRegionTemplate(template, detectedRegion);
+        resolvedRegion = detectedRegion;
+      }
+    }
+  }
+  const templateSettings = structuredClone(template.settings);
+  const newEnv = { ...templateSettings.env, ANTHROPIC_AUTH_TOKEN: apiKey };
+  if (providerHasRegions(providerName) && !resolvedRegion && existingBaseUrl) {
+    newEnv.ANTHROPIC_BASE_URL = existingBaseUrl;
+  }
+  for (const key of TUNABLE_ENV_VARS) {
+    if (key in existingEnv && existingEnv[key] !== templateSettings.env[key]) {
+      newEnv[key] = existingEnv[key];
+    }
+  }
+  raw.env = { ...existingEnv, ...newEnv };
+  raw.includeCoAuthoredBy = template.settings.includeCoAuthoredBy;
+  raw.alwaysThinkingEnabled = template.settings.alwaysThinkingEnabled;
+  writeFileSync2(settingsFile, JSON.stringify(raw, null, 2), "utf-8");
+  let needsSave = false;
+  const config = await loadConfig();
+  const inst = config.instances.find((i) => i.name === instance.name);
+  if (inst) {
+    if (!inst.providerTemplate) {
+      inst.providerTemplate = providerName;
+      needsSave = true;
+    }
+    if (providerHasRegions(providerName) && resolvedRegion && !inst.providerRegion) {
+      inst.providerRegion = resolvedRegion;
+      needsSave = true;
+    }
+    if (needsSave) {
+      await saveConfigAtomic(config);
+    }
+  }
+}
 async function syncPluginsAndSkills(configDir) {
   const defaultDir = getDefaultClaudeDir();
-  if (!existsSync5(configDir)) {
+  if (!existsSync4(configDir)) {
     throw new ClaudeMultiError(ErrorCode.INSTANCE_DIR_NOT_FOUND, "Instance config directory does not exist");
   }
   await Promise.all(SYNC_DIRS.map(async (dir) => {
-    const targetPath = join5(configDir, dir);
-    const sourcePath = join5(defaultDir, dir);
-    if (!existsSync5(sourcePath)) {
+    const targetPath = join4(configDir, dir);
+    const sourcePath = join4(defaultDir, dir);
+    if (!existsSync4(sourcePath)) {
       console.log(source_default.yellow(`  ⚠ Source ${dir} not found in ${defaultDir}, skipping`));
       return;
     }
-    if (existsSync5(targetPath)) {
+    if (existsSync4(targetPath)) {
       try {
         const linkTarget = readlinkSync(targetPath);
-        if (linkTarget === sourcePath || linkTarget === join5("..", "..", ".claude", dir)) {
+        if (linkTarget === sourcePath || linkTarget === join4("..", "..", ".claude", dir)) {
           console.log(source_default.gray(`  ✓ ${dir} already synced`));
           return;
         }
@@ -10605,8 +10643,8 @@ async function syncPluginsAndSkills(configDir) {
 async function copyFilesRecursive(source, target) {
   const entries = readdirSync2(source);
   await Promise.all(entries.map(async (entry) => {
-    const sourceEntry = join5(source, entry);
-    const targetEntry = join5(target, entry);
+    const sourceEntry = join4(source, entry);
+    const targetEntry = join4(target, entry);
     const stat = statSync(sourceEntry);
     if (stat.isDirectory()) {
       await mkdir(targetEntry, { recursive: true });
@@ -10618,13 +10656,13 @@ async function copyFilesRecursive(source, target) {
 }
 async function unsyncPluginsAndSkills(configDir) {
   const defaultDir = getDefaultClaudeDir();
-  if (!existsSync5(configDir)) {
+  if (!existsSync4(configDir)) {
     throw new ClaudeMultiError(ErrorCode.INSTANCE_DIR_NOT_FOUND, "Instance config directory does not exist");
   }
   await Promise.all(SYNC_DIRS.map(async (dir) => {
-    const targetPath = join5(configDir, dir);
-    const sourcePath = join5(defaultDir, dir);
-    if (!existsSync5(sourcePath)) {
+    const targetPath = join4(configDir, dir);
+    const sourcePath = join4(defaultDir, dir);
+    if (!existsSync4(sourcePath)) {
       console.log(source_default.yellow(`  ⚠ Source ${dir} not found in ${defaultDir}, skipping`));
       return;
     }
@@ -10636,7 +10674,7 @@ async function unsyncPluginsAndSkills(configDir) {
     if (isSymlink) {
       rmSync2(targetPath, { force: true });
       console.log(source_default.gray(`  ✓ Removed symlink for ${dir}`));
-    } else if (!existsSync5(targetPath)) {} else {
+    } else if (!existsSync4(targetPath)) {} else {
       console.log(source_default.yellow(`  ⚠ ${dir} is already a regular directory, skipping`));
       return;
     }
@@ -10646,8 +10684,8 @@ async function unsyncPluginsAndSkills(configDir) {
   }));
 }
 async function readClaudeSettings(configDir) {
-  const settingsFile = join5(configDir, "settings.json");
-  if (!existsSync5(settingsFile)) {
+  const settingsFile = join4(configDir, "settings.json");
+  if (!existsSync4(settingsFile)) {
     return null;
   }
   try {
@@ -10659,10 +10697,10 @@ async function readClaudeSettings(configDir) {
   }
 }
 async function writeClaudeSettings(configDir, settings) {
-  if (!existsSync5(configDir)) {
+  if (!existsSync4(configDir)) {
     await mkdir(configDir, { recursive: true });
   }
-  await writeJsonFileAtomic(join5(configDir, "settings.json"), settings);
+  await writeJsonFileAtomic(join4(configDir, "settings.json"), settings);
 }
 async function getEnabledPlugins(configDir) {
   const settings = await readClaudeSettings(configDir);
@@ -10712,18 +10750,18 @@ function readMcpJsonFile(mcpPath) {
 }
 function scanPluginDir(baseDir, category, enabledPlugins) {
   const subDir = category === PluginCategory.Internal ? "plugins" : "external_plugins";
-  const dir = join5(baseDir, MARKETPLACE_REL, subDir);
-  if (!existsSync5(dir))
+  const dir = join4(baseDir, MARKETPLACE_REL, subDir);
+  if (!existsSync4(dir))
     return [];
   const results = [];
   for (const entry of readdirSync2(dir, { withFileTypes: true })) {
     if (!entry.isDirectory())
       continue;
-    const pluginPath = join5(dir, entry.name);
+    const pluginPath = join4(dir, entry.name);
     let name = entry.name;
     let description = "";
-    const metaFile = join5(pluginPath, ".claude-plugin", "plugin.json");
-    if (existsSync5(metaFile)) {
+    const metaFile = join4(pluginPath, ".claude-plugin", "plugin.json");
+    if (existsSync4(metaFile)) {
       try {
         const meta = JSON.parse(readFileSync4(metaFile, "utf-8"));
         if (meta.name)
@@ -10734,8 +10772,8 @@ function scanPluginDir(baseDir, category, enabledPlugins) {
         console.error(source_default.yellow(`Warning: Could not parse plugin metadata for ${entry.name}`));
       }
     }
-    const mcpFile = join5(pluginPath, ".mcp.json");
-    const hasMcp = existsSync5(mcpFile);
+    const mcpFile = join4(pluginPath, ".mcp.json");
+    const hasMcp = existsSync4(mcpFile);
     let mcpServerNames;
     if (hasMcp) {
       const servers = readMcpJsonFile(mcpFile);
@@ -10758,8 +10796,8 @@ function scanPluginDir(baseDir, category, enabledPlugins) {
 }
 function scanPluginsFromDir(baseDir) {
   let enabledPlugins = {};
-  const settingsFile = join5(baseDir, "settings.json");
-  if (existsSync5(settingsFile)) {
+  const settingsFile = join4(baseDir, "settings.json");
+  if (existsSync4(settingsFile)) {
     try {
       const s = JSON.parse(readFileSync4(settingsFile, "utf-8"));
       if (s.enabledPlugins)
@@ -10779,7 +10817,7 @@ function listInstancePlugins(configDir) {
   return scanPluginsFromDir(configDir);
 }
 function isPluginsSymlinked(configDir) {
-  const pluginsPath = join5(configDir, "plugins");
+  const pluginsPath = join4(configDir, "plugins");
   const st = lstatSafe(pluginsPath);
   return st?.isSymbolicLink() ?? false;
 }
@@ -10795,8 +10833,8 @@ function isClaudeCodeRunning(configDir) {
   }
 }
 function readInstalledPlugins(pluginsDir) {
-  const filePath = join5(pluginsDir, "installed_plugins.json");
-  if (!existsSync5(filePath)) {
+  const filePath = join4(pluginsDir, "installed_plugins.json");
+  if (!existsSync4(filePath)) {
     return { version: 2, plugins: {} };
   }
   try {
@@ -10806,16 +10844,16 @@ function readInstalledPlugins(pluginsDir) {
   }
 }
 async function writeInstalledPlugins(pluginsDir, data) {
-  await writeJsonFileAtomic(join5(pluginsDir, "installed_plugins.json"), data);
+  await writeJsonFileAtomic(join4(pluginsDir, "installed_plugins.json"), data);
 }
 async function addPluginToInstalledPlugins(configDir, pluginId) {
-  const pluginsDir = join5(configDir, "plugins");
+  const pluginsDir = join4(configDir, "plugins");
   const data = readInstalledPlugins(pluginsDir);
   const key = `${pluginId}@claude-plugins-official`;
   if (!data.plugins[key]) {
     data.plugins[key] = [];
   }
-  const cachePath = join5(configDir, MARKETPLACE_REL);
+  const cachePath = join4(configDir, MARKETPLACE_REL);
   const entry = {
     scope: "user",
     installPath: cachePath,
@@ -10827,7 +10865,7 @@ async function addPluginToInstalledPlugins(configDir, pluginId) {
   await writeInstalledPlugins(pluginsDir, data);
 }
 async function removePluginFromInstalledPlugins(configDir, pluginId) {
-  const pluginsDir = join5(configDir, "plugins");
+  const pluginsDir = join4(configDir, "plugins");
   const data = readInstalledPlugins(pluginsDir);
   const key = `${pluginId}@claude-plugins-official`;
   delete data.plugins[key];
@@ -10837,7 +10875,7 @@ function estimatePluginSize(pluginPath) {
   let total = 0;
   try {
     for (const entry of readdirSync2(pluginPath, { withFileTypes: true })) {
-      const fullPath = join5(pluginPath, entry.name);
+      const fullPath = join4(pluginPath, entry.name);
       if (entry.isDirectory()) {
         total += estimatePluginSize(fullPath);
       } else {
@@ -10855,8 +10893,8 @@ function detectMcpCollisions(configDir, newPluginIds) {
   const defaultDir = getDefaultClaudeDir();
   for (const pluginId of newPluginIds) {
     for (const subDir of ["plugins", "external_plugins"]) {
-      const mcpFile = join5(defaultDir, MARKETPLACE_REL, subDir, pluginId, ".mcp.json");
-      if (!existsSync5(mcpFile))
+      const mcpFile = join4(defaultDir, MARKETPLACE_REL, subDir, pluginId, ".mcp.json");
+      if (!existsSync4(mcpFile))
         continue;
       const newServers = readMcpJsonFile(mcpFile);
       for (const name of Object.keys(newServers)) {
@@ -10875,10 +10913,10 @@ function detectMcpCollisions(configDir, newPluginIds) {
 function validatePluginOperation(configDir, operation, pluginId) {
   const errors = [];
   const warnings = [];
-  if (!existsSync5(configDir)) {
+  if (!existsSync4(configDir)) {
     errors.push("Instance config directory does not exist");
   }
-  if (existsSync5(configDir) && isPluginsSymlinked(configDir)) {
+  if (existsSync4(configDir) && isPluginsSymlinked(configDir)) {
     errors.push("Plugins directory is symlinked (auto-sync). Disable auto-sync first.");
   }
   if (operation === PluginAction.Install && pluginId) {
@@ -10893,7 +10931,7 @@ function validatePluginOperation(configDir, operation, pluginId) {
       errors.push(`Plugin '${pluginId}' not installed in this instance`);
     }
   }
-  if (operation === PluginAction.Install && pluginId && existsSync5(configDir)) {
+  if (operation === PluginAction.Install && pluginId && existsSync4(configDir)) {
     const collisions = detectMcpCollisions(configDir, [pluginId]);
     for (const c of collisions) {
       warnings.push(`MCP server name collision: '${c.serverName}'`);
@@ -10904,27 +10942,27 @@ function validatePluginOperation(configDir, operation, pluginId) {
 async function copySinglePlugin(targetConfigDir, pluginId, category) {
   const defaultDir = getDefaultClaudeDir();
   const subDir = category === PluginCategory.Internal ? "plugins" : "external_plugins";
-  const sourcePlugin = join5(defaultDir, MARKETPLACE_REL, subDir, pluginId);
-  const targetPlugin = join5(targetConfigDir, MARKETPLACE_REL, subDir, pluginId);
-  if (!existsSync5(sourcePlugin)) {
+  const sourcePlugin = join4(defaultDir, MARKETPLACE_REL, subDir, pluginId);
+  const targetPlugin = join4(targetConfigDir, MARKETPLACE_REL, subDir, pluginId);
+  if (!existsSync4(sourcePlugin)) {
     throw new ClaudeMultiError(ErrorCode.PLUGIN_NOT_FOUND, `Plugin '${pluginId}' not found in default Claude`);
   }
-  const scaffoldDir = join5(targetConfigDir, MARKETPLACE_REL, subDir);
-  if (!existsSync5(scaffoldDir)) {
+  const scaffoldDir = join4(targetConfigDir, MARKETPLACE_REL, subDir);
+  if (!existsSync4(scaffoldDir)) {
     await mkdir(scaffoldDir, { recursive: true });
   }
-  const marketplaceDir = join5(targetConfigDir, MARKETPLACE_REL);
-  if (!existsSync5(marketplaceDir)) {
+  const marketplaceDir = join4(targetConfigDir, MARKETPLACE_REL);
+  if (!existsSync4(marketplaceDir)) {
     await mkdir(marketplaceDir, { recursive: true });
   }
   for (const metaFile of ["known_marketplaces.json", "blocklist.json"]) {
-    const src = join5(defaultDir, MARKETPLACE_REL, metaFile);
-    const tgt = join5(marketplaceDir, metaFile);
-    if (existsSync5(src) && !existsSync5(tgt)) {
+    const src = join4(defaultDir, MARKETPLACE_REL, metaFile);
+    const tgt = join4(marketplaceDir, metaFile);
+    if (existsSync4(src) && !existsSync4(tgt)) {
       await copyFile(src, tgt);
     }
   }
-  if (existsSync5(targetPlugin)) {
+  if (existsSync4(targetPlugin)) {
     rmSync2(targetPlugin, { force: true, recursive: true });
   }
   await copyDirRecursive(sourcePlugin, targetPlugin);
@@ -10943,15 +10981,15 @@ async function copySelectedPlugins(targetConfigDir, selections) {
   const defaultDir = getDefaultClaudeDir();
   for (const sel of selections) {
     const subDir = sel.category === PluginCategory.Internal ? "plugins" : "external_plugins";
-    const source = join5(defaultDir, MARKETPLACE_REL, subDir, sel.id);
-    if (!existsSync5(source)) {
+    const source = join4(defaultDir, MARKETPLACE_REL, subDir, sel.id);
+    if (!existsSync4(source)) {
       throw new ClaudeMultiError(ErrorCode.PLUGIN_NOT_FOUND, `Plugin '${sel.id}' not found in default Claude`);
     }
   }
   let totalSize = 0;
   for (const sel of selections) {
     const subDir = sel.category === PluginCategory.Internal ? "plugins" : "external_plugins";
-    totalSize += estimatePluginSize(join5(defaultDir, MARKETPLACE_REL, subDir, sel.id));
+    totalSize += estimatePluginSize(join4(defaultDir, MARKETPLACE_REL, subDir, sel.id));
   }
   if (totalSize > 104857600) {
     throw new ClaudeMultiError(ErrorCode.PLUGIN_TOO_LARGE, `Selected plugins total ${(totalSize / 1024 / 1024).toFixed(1)}MB. Ensure sufficient disk space.`);
@@ -10966,8 +11004,8 @@ async function copySelectedPlugins(targetConfigDir, selections) {
     for (const done of completed) {
       try {
         const subDir = done.category === PluginCategory.Internal ? "plugins" : "external_plugins";
-        const targetPath = join5(targetConfigDir, MARKETPLACE_REL, subDir, done.id);
-        if (existsSync5(targetPath)) {
+        const targetPath = join4(targetConfigDir, MARKETPLACE_REL, subDir, done.id);
+        if (existsSync4(targetPath)) {
           rmSync2(targetPath, { force: true, recursive: true });
         }
         await removePluginFromInstalledPlugins(targetConfigDir, done.id);
@@ -10983,8 +11021,8 @@ async function removeSinglePlugin(configDir, pluginId, category) {
     throw new ClaudeMultiError(ErrorCode.SYMLINK_CONFLICT, "Cannot remove plugins from a symlinked instance. Disable auto-sync first.");
   }
   const subDir = category === PluginCategory.Internal ? "plugins" : "external_plugins";
-  const pluginPath = join5(configDir, MARKETPLACE_REL, subDir, pluginId);
-  if (!existsSync5(pluginPath)) {
+  const pluginPath = join4(configDir, MARKETPLACE_REL, subDir, pluginId);
+  if (!existsSync4(pluginPath)) {
     throw new ClaudeMultiError(ErrorCode.PLUGIN_NOT_FOUND, `Plugin '${pluginId}' not found in this instance`);
   }
   const backupPath = pluginPath + ".removing";
@@ -11007,16 +11045,16 @@ async function removeSinglePlugin(configDir, pluginId, category) {
 }
 function getMcpServersFromPlugins(configDir) {
   const result = {};
-  const basePlugins = join5(configDir, MARKETPLACE_REL);
+  const basePlugins = join4(configDir, MARKETPLACE_REL);
   for (const subDir of ["plugins", "external_plugins"]) {
-    const dir = join5(basePlugins, subDir);
-    if (!existsSync5(dir))
+    const dir = join4(basePlugins, subDir);
+    if (!existsSync4(dir))
       continue;
     for (const entry of readdirSync2(dir, { withFileTypes: true })) {
       if (!entry.isDirectory())
         continue;
-      const mcpFile = join5(dir, entry.name, ".mcp.json");
-      if (!existsSync5(mcpFile))
+      const mcpFile = join4(dir, entry.name, ".mcp.json");
+      if (!existsSync4(mcpFile))
         continue;
       const servers = readMcpJsonFile(mcpFile);
       Object.assign(result, servers);
@@ -11051,6 +11089,7 @@ var init_config = __esm(() => {
   init_json_file();
   init_errors();
   init_constants();
+  init_env();
   init_source();
   SYNC_DIRS = ["plugins", "skills"];
 });
@@ -33330,7 +33369,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
           return 0;
         };
         var validate2 = function validate3(version) {
-          return typeof version === "string" && /^[v\d]/.test(version) && semver3.test(version);
+          return typeof version === "string" && /^[v\d]/.test(version) && semver2.test(version);
         };
         var compare = function compare2(v1, v2, operator) {
           assertValidOperator(operator);
@@ -33364,12 +33403,12 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
             return false;
           return true;
         };
-        var semver3 = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i;
+        var semver2 = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i;
         var validateAndParse = function validateAndParse2(version) {
           if (typeof version !== "string") {
             throw new TypeError("Invalid argument expected string");
           }
-          var match = version.match(semver3);
+          var match = version.match(semver2);
           if (!match) {
             throw new Error("Invalid argument not valid semver ('".concat(version, "' received)"));
           }
@@ -56046,6 +56085,18 @@ function useConfig() {
     }
     await reload();
   }, [reload]);
+  const syncTemplateEnv = import_react66.useCallback(async (instance) => {
+    await syncProviderTemplateForInstance(instance);
+    await reload();
+  }, [reload]);
+  const regenerateWrapper = import_react66.useCallback(async (instance) => {
+    await createWrapper({
+      name: instance.name,
+      configDir: instance.configDir,
+      binaryPath: instance.binaryPath
+    });
+    await reload();
+  }, [reload]);
   const migrationStatus = config ? getMigrationStatus(config) : null;
   return {
     config,
@@ -56056,6 +56107,8 @@ function useConfig() {
     addInstance: addInstance2,
     removeInstance: removeInstance2,
     toggleAutoSync,
+    syncTemplateEnv,
+    regenerateWrapper,
     migrationStatus,
     instanceMigrationVersion: config?.instanceMigrationVersion,
     getInstance,
@@ -56125,7 +56178,7 @@ var exports_AddInstance = {};
 __export(exports_AddInstance, {
   AddInstance: () => AddInstance
 });
-import { join as join7 } from "node:path";
+import { join as join6 } from "node:path";
 import { homedir as homedir3 } from "node:os";
 function stepNumber(step) {
   return STEP_FLOW.indexOf(step) + 1;
@@ -56169,6 +56222,9 @@ function reducer5(state, action) {
     case "SET_ERROR":
       return { ...state, error: action.error };
     case "SELECT_PROVIDER":
+      if (!action.provider || !providerHasRegions(action.provider)) {
+        return { ...state, selectedProvider: action.provider, useProvider: action.useProvider, selectedRegion: null };
+      }
       return { ...state, selectedProvider: action.provider, useProvider: action.useProvider };
     case "SET_REGION":
       return { ...state, selectedRegion: action.region };
@@ -56291,34 +56347,37 @@ var import_react67, jsx_dev_runtime4, AddResult = ({
       onChange: onSelect
     }, undefined, false, undefined, this)
   ]
-}, undefined, true, undefined, this), ProviderRegionStep = ({ state, onSelect }) => /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
-  flexDirection: "column",
-  gap: 1,
-  children: [
-    /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-      children: "Select your subscription region:"
-    }, undefined, false, undefined, this),
-    /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
-      borderStyle: "round",
-      borderColor: "yellow",
-      paddingX: 1,
-      children: /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-        bold: true,
-        color: "yellow",
-        children: "Check your Xiaomi account console to confirm the correct region for your subscription."
+}, undefined, true, undefined, this), ProviderRegionStep = ({ state, onSelect }) => {
+  const regions = state.selectedProvider ? getProviderRegions(state.selectedProvider) : undefined;
+  return /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
+    flexDirection: "column",
+    gap: 1,
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
+        children: "Select your subscription region:"
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
+        borderStyle: "round",
+        borderColor: "yellow",
+        paddingX: 1,
+        children: /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
+          bold: true,
+          color: "yellow",
+          children: "Check your account console to confirm the correct region for your subscription."
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Select, {
+        options: regions ? Object.entries(regions).map(([key, val]) => ({
+          label: `${val.label} — ${val.baseUrl}`,
+          value: key
+        })) : [],
+        visibleOptionCount: 3,
+        defaultValue: state.selectedRegion ?? undefined,
+        onChange: onSelect
       }, undefined, false, undefined, this)
-    }, undefined, false, undefined, this),
-    /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Select, {
-      options: Object.entries(MIMO_TOKEN_REGIONS).map(([key, val]) => ({
-        label: `${val.label} — ${val.baseUrl}`,
-        value: key
-      })),
-      visibleOptionCount: 3,
-      defaultValue: state.selectedRegion ?? undefined,
-      onChange: onSelect
-    }, undefined, false, undefined, this)
-  ]
-}, undefined, true, undefined, this), ProviderApiKeyStep = ({ state, onSubmit }) => /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
+    ]
+  }, undefined, true, undefined, this);
+}, ProviderApiKeyStep = ({ state, onSubmit }) => /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
   flexDirection: "column",
   gap: 1,
   children: [
@@ -56345,7 +56404,7 @@ var import_react67, jsx_dev_runtime4, AddResult = ({
       dimColor: true,
       children: [
         "Config: ",
-        join7(homedir3(), `.claude-${state.name}`)
+        join6(homedir3(), `.claude-${state.name}`)
       ]
     }, undefined, true, undefined, this),
     /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
@@ -56475,7 +56534,7 @@ var import_react67, jsx_dev_runtime4, AddResult = ({
     dispatch({ type: "SET_STEP", step: "creating" /* Creating */ });
     dispatch({ type: "SET_ERROR", error: "" });
     try {
-      const cDir = join7(homedir3(), `.claude-${state.name}`);
+      const cDir = join6(homedir3(), `.claude-${state.name}`);
       const bPath = cfg.getDefaultBinaryPath(state.name);
       const instance = {
         name: state.name,
@@ -56483,7 +56542,9 @@ var import_react67, jsx_dev_runtime4, AddResult = ({
         binaryPath: bPath,
         createdAt: new Date().toISOString(),
         autoSync: sync,
-        createdWithVersion: getClaudeMultiVersion()
+        createdWithVersion: getClaudeMultiVersion(),
+        ...state.useProvider && state.selectedProvider ? { providerTemplate: state.selectedProvider } : {},
+        ...state.selectedRegion && state.useProvider && state.selectedProvider && providerHasRegions(state.selectedProvider) ? { providerRegion: state.selectedRegion } : {}
       };
       await cfg.addInstance(instance);
       await Promise.all([
@@ -56717,10 +56778,11 @@ __export(exports_health, {
   dismissIssue: () => dismissIssue,
   dismissAllIssues: () => dismissAllIssues
 });
-import { existsSync as existsSync7, readFileSync as readFileSync6, writeFileSync as writeFileSync3, mkdirSync as mkdirSync5 } from "node:fs";
-import { join as join8 } from "node:path";
+import { existsSync as existsSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync3, mkdirSync as mkdirSync4, renameSync as renameSync2, unlinkSync as unlinkSync2 } from "node:fs";
+import { randomBytes as randomBytes3 } from "node:crypto";
+import { join as join7 } from "node:path";
 function getHealthFile() {
-  return join8(getBaseDir(), ".claude-multi", "health-status.json");
+  return join7(getBaseDir(), ".claude-multi", "health-status.json");
 }
 function runHealthChecks(instances2, migrationStatus, instanceMigrationVersion) {
   const now2 = new Date().toISOString();
@@ -56757,7 +56819,7 @@ function runHealthChecks(instances2, migrationStatus, instanceMigrationVersion)
     });
   }
   for (const inst of instances2) {
-    if (!existsSync7(inst.configDir)) {
+    if (!existsSync6(inst.configDir)) {
       issues.push({
         id: `configdir-missing-${inst.name}`,
         severity: "error",
@@ -56773,7 +56835,7 @@ function runHealthChecks(instances2, migrationStatus, instanceMigrationVersion)
       });
       continue;
     }
-    if (!existsSync7(inst.binaryPath)) {
+    if (!existsSync6(inst.binaryPath)) {
       issues.push({
         id: `binary-missing-${inst.name}`,
         severity: "warning",
@@ -56788,10 +56850,11 @@ function runHealthChecks(instances2, migrationStatus, instanceMigrationVersion)
         resolutionHint: "Re-create the instance or run 'claude-multi sync'"
       });
     }
-    const settingsFile = join8(inst.configDir, "settings.json");
-    if (existsSync7(settingsFile)) {
+    const settingsFile = join7(inst.configDir, "settings.json");
+    if (existsSync6(settingsFile)) {
+      let parsed = null;
       try {
-        JSON.parse(readFileSync6(settingsFile, "utf-8"));
+        parsed = JSON.parse(readFileSync6(settingsFile, "utf-8"));
       } catch {
         issues.push({
           id: `settings-corrupt-${inst.name}`,
@@ -56807,6 +56870,29 @@ function runHealthChecks(instances2, migrationStatus, instanceMigrationVersion)
           resolutionHint: "Fix or delete the corrupted settings.json"
         });
       }
+      if (parsed && inst.providerTemplate && providerHasRegions(inst.providerTemplate)) {
+        const env3 = parsed.env;
+        const actualUrl = env3?.ANTHROPIC_BASE_URL;
+        const actualRegion = actualUrl ? detectRegionFromBaseUrl(actualUrl) : null;
+        if (inst.providerRegion && actualRegion && inst.providerRegion !== actualRegion) {
+          const providerRegions = getProviderRegions(inst.providerTemplate);
+          const expectedUrl = providerRegions?.[inst.providerRegion]?.baseUrl;
+          issues.push({
+            id: `region-mismatch-${inst.name}`,
+            severity: "warning",
+            category: "settings",
+            title: "Region URL mismatch",
+            message: `Instance '${inst.name}' stored region is ${inst.providerRegion} but base URL points to ${actualRegion}`,
+            detail: `Stored region: ${inst.providerRegion} (${expectedUrl})
+Actual URL: ${actualUrl}`,
+            instanceName: inst.name,
+            timestamp: now2,
+            dismissed: false,
+            resolved: false,
+            resolutionHint: `Edit settings.json to set ANTHROPIC_BASE_URL to ${expectedUrl}, or run 'claude-multi doctor fix'`
+          });
+        }
+      }
     }
     const symlinks = detectBrokenSymlinks(inst.configDir);
     if (symlinks.broken.length > 0) {
@@ -56824,13 +56910,15 @@ function runHealthChecks(instances2, migrationStatus, instanceMigrationVersion)
         resolutionHint: "Re-sync symlinks from the home screen"
       });
     }
-    if (existsSync7(inst.binaryPath) && existsSync7(PINNED_CLAUDE_BIN)) {
+    const expectedClaudePath = tryGetClaudePath();
+    if (existsSync6(inst.binaryPath) && expectedClaudePath) {
       try {
         const wrapperContent = readFileSync6(inst.binaryPath, "utf-8");
         const shellMatch = wrapperContent.match(/exec\s+"([^"]+)"/);
+        const cmdMatch = wrapperContent.match(/"([^"]+)"\s+%\*/);
         const nodeMatch = wrapperContent.match(/spawn\("([^"]+)"/);
-        const currentBin = shellMatch?.[1] ?? nodeMatch?.[1];
-        if (currentBin && currentBin !== PINNED_CLAUDE_BIN) {
+        const currentBin = shellMatch?.[1] ?? cmdMatch?.[1] ?? nodeMatch?.[1];
+        if (currentBin && currentBin !== expectedClaudePath) {
           issues.push({
             id: `wrong-claude-version-${inst.name}`,
             severity: "error",
@@ -56838,7 +56926,7 @@ function runHealthChecks(instances2, migrationStatus, instanceMigrationVersion)
             title: "Wrong Claude binary",
             message: `Instance '${inst.name}' uses a Claude version that may break 3rd-party providers`,
             detail: `Current: ${currentBin}
-Expected: ${PINNED_CLAUDE_BIN}`,
+Expected: ${expectedClaudePath}`,
             instanceName: inst.name,
             timestamp: now2,
             dismissed: false,
@@ -56868,7 +56956,7 @@ Expected: ${PINNED_CLAUDE_BIN}`,
 }
 function loadHealthStatus() {
   const healthFile = getHealthFile();
-  if (!existsSync7(healthFile)) {
+  if (!existsSync6(healthFile)) {
     return { lastChecked: "", issues: [] };
   }
   try {
@@ -56878,10 +56966,21 @@ function loadHealthStatus() {
   }
 }
 function saveHealthStatus(status) {
-  const dir = join8(getBaseDir(), ".claude-multi");
-  if (!existsSync7(dir))
-    mkdirSync5(dir, { recursive: true });
-  writeFileSync3(getHealthFile(), JSON.stringify(status, null, 2), "utf-8");
+  const dir = join7(getBaseDir(), ".claude-multi");
+  if (!existsSync6(dir))
+    mkdirSync4(dir, { recursive: true });
+  const healthFile = getHealthFile();
+  const tmpPath = `${healthFile}.tmp.${randomBytes3(4).toString("hex")}`;
+  try {
+    writeFileSync3(tmpPath, JSON.stringify(status, null, 2), "utf-8");
+    JSON.parse(readFileSync6(tmpPath, "utf-8"));
+    renameSync2(tmpPath, healthFile);
+  } catch (err) {
+    try {
+      unlinkSync2(tmpPath);
+    } catch {}
+    throw err;
+  }
 }
 function dismissIssue(id) {
   const status = loadHealthStatus();
@@ -56899,20 +56998,22 @@ function dismissAllIssues() {
   saveHealthStatus(status);
 }
 function fixWrapperVersions(instances2) {
-  if (!existsSync7(PINNED_CLAUDE_BIN))
+  const expectedClaudePath = tryGetClaudePath();
+  if (!expectedClaudePath)
     return [];
   const fixed = [];
   for (const inst of instances2) {
-    if (!existsSync7(inst.binaryPath))
+    if (!existsSync6(inst.binaryPath))
       continue;
     try {
       const content = readFileSync6(inst.binaryPath, "utf-8");
       const shellMatch = content.match(/exec\s+"([^"]+)"/);
+      const cmdMatch = content.match(/"([^"]+)"\s+%\*/);
       const nodeMatch = content.match(/spawn\("([^"]+)"/);
-      const currentBin = shellMatch?.[1] ?? nodeMatch?.[1];
-      if (!currentBin || currentBin === PINNED_CLAUDE_BIN)
+      const currentBin = shellMatch?.[1] ?? cmdMatch?.[1] ?? nodeMatch?.[1];
+      if (!currentBin || currentBin === expectedClaudePath)
         continue;
-      const newContent = buildWrapperScript(inst, PINNED_CLAUDE_BIN);
+      const newContent = buildWrapperScript(inst, expectedClaudePath);
       if (content !== newContent) {
         writeFileSync3(inst.binaryPath, newContent, { mode: 493 });
       }
@@ -56928,6 +57029,7 @@ var init_health = __esm(() => {
   init_version();
   init_migration();
   init_wrapper();
+  init_templates();
 });
 
 // src/ink/components/Footer.tsx
@@ -57071,12 +57173,12 @@ var jsx_dev_runtime6, WarningBanner = ({
         children: [
           /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
             color: "red",
-            children: "  ⚠ Some instances use a Claude version incompatible with 3rd-party APIs. "
+            children: "  ⚠ Some instances have version issues. "
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime6.jsxDEV(Text, {
             color: "red",
             bold: true,
-            children: "Press ! to auto-fix."
+            children: "Press ! to review and fix."
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this)
@@ -57348,7 +57450,110 @@ var init_InstanceSelectMenu = __esm(async () => {
   jsx_dev_runtime9 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
+// src/ink/util/instance-diagnostics.ts
+import { existsSync as existsSync7, readFileSync as readFileSync7 } from "node:fs";
+import { join as join8 } from "node:path";
+function tryResolveRegionalTemplate(template2, region) {
+  if (!template2)
+    return;
+  try {
+    const providerRegions = getProviderRegions(template2.name);
+    if (providerRegions && region in providerRegions) {
+      return resolveRegionTemplate(template2, region);
+    }
+  } catch {}
+  return;
+}
+function detectTemplateMismatch(instance) {
+  const providerName = instance.providerTemplate ?? detectProvider(instance.configDir);
+  if (!providerName) {
+    return { status: "unknown", providerName: null };
+  }
+  let template2 = getProviderTemplate(providerName);
+  if (!template2) {
+    return { status: "unknown", providerName };
+  }
+  const settingsFile = join8(instance.configDir, "settings.json");
+  if (!existsSync7(settingsFile)) {
+    return { status: "unknown", providerName };
+  }
+  let existingEnv = {};
+  try {
+    const raw = JSON.parse(readFileSync7(settingsFile, "utf-8"));
+    existingEnv = raw.env ?? {};
+  } catch {
+    return { status: "unknown", providerName };
+  }
+  if (providerHasRegions(providerName)) {
+    const existingUrl = existingEnv.ANTHROPIC_BASE_URL;
+    const detectedRegion = existingUrl ? detectRegionFromBaseUrl(existingUrl) ?? instance.providerRegion : instance.providerRegion;
+    if (detectedRegion) {
+      const resolved = tryResolveRegionalTemplate(template2, detectedRegion);
+      if (resolved) {
+        template2 = resolved;
+      }
+    }
+  }
+  const templateEnv = template2.settings.env;
+  for (const [key, expectedValue] of Object.entries(templateEnv)) {
+    if (key === "ANTHROPIC_AUTH_TOKEN")
+      continue;
+    if (TUNABLE_ENV_VARS.has(key))
+      continue;
+    if (existingEnv[key] !== expectedValue) {
+      return { status: "mismatch", providerName };
+    }
+  }
+  return { status: "match", providerName };
+}
+function detectWrapperMismatch(instance) {
+  if (!existsSync7(instance.binaryPath)) {
+    return { status: "missing" };
+  }
+  const expected = generateWrapperScriptSafe({
+    name: instance.name,
+    configDir: instance.configDir,
+    binaryPath: instance.binaryPath
+  });
+  if (expected === null) {
+    return { status: "unknown" };
+  }
+  try {
+    const current = readFileSync7(instance.binaryPath, "utf-8");
+    return current === expected ? { status: "match" } : { status: "mismatch" };
+  } catch {
+    return { status: "unknown" };
+  }
+}
+var init_instance_diagnostics = __esm(() => {
+  init_templates();
+  init_wrapper();
+  init_env();
+});
+
 // src/ink/screens/ShowInstanceInfo.tsx
+function templateStatusLabel(status) {
+  switch (status) {
+    case "match":
+      return "✓ up to date";
+    case "mismatch":
+      return "⚠ mismatch detected";
+    case "unknown":
+      return "? unknown";
+  }
+}
+function wrapperStatusLabel(status) {
+  switch (status) {
+    case "match":
+      return "✓ up to date";
+    case "mismatch":
+      return "⚠ mismatch detected";
+    case "missing":
+      return "✗ wrapper missing";
+    case "unknown":
+      return "? unknown";
+  }
+}
 var import_react69, jsx_dev_runtime10, DetailRow = ({
   label,
   value,
@@ -57382,19 +57587,74 @@ var import_react69, jsx_dev_runtime10, DetailRow = ({
       }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
-}, EMPTY_INFO, ShowInstanceInfo = ({ onBack }) => {
-  const { instances: instances2, listInstancePlugins: listInstancePlugins2, getInstanceMcpServers: getInstanceMcpServers2 } = useConfig();
+}, EMPTY_INFO, ACTION_VALUES, ShowInstanceInfo = ({ onBack }) => {
+  const { exit } = use_app_default();
+  const { instances: instances2, listInstancePlugins: listInstancePlugins2, getInstanceMcpServers: getInstanceMcpServers2, syncTemplateEnv, regenerateWrapper } = useConfig();
   const [step, setStep] = import_react69.useState("select");
   const [selected, setSelected] = import_react69.useState(null);
   const [infoData, setInfoData] = import_react69.useState(EMPTY_INFO);
-  useNavigation(() => {
-    if (step === "info") {
-      setStep("select");
-      setSelected(null);
-    } else {
-      onBack();
+  const [templateStatus, setTemplateStatus] = import_react69.useState("unknown");
+  const [wrapperStatus, setWrapperStatus] = import_react69.useState("unknown");
+  const [providerName, setProviderName] = import_react69.useState(null);
+  const [actionResult, setActionResult] = import_react69.useState(null);
+  const [executing, setExecuting] = import_react69.useState(false);
+  const liveSelected = selected ? instances2.find((i) => i.name === selected.name) ?? selected : null;
+  const runDiagnostics = import_react69.useCallback((inst) => {
+    const tmpl = detectTemplateMismatch(inst);
+    const wrap2 = detectWrapperMismatch(inst);
+    setTemplateStatus(tmpl.status);
+    setWrapperStatus(wrap2.status);
+    setProviderName(tmpl.providerName);
+  }, []);
+  const loadInstanceInfo = import_react69.useCallback(async (inst) => {
+    try {
+      const plugins = listInstancePlugins2(inst.configDir);
+      const mcpData = await getInstanceMcpServers2(inst.configDir);
+      setInfoData({
+        pluginCount: plugins.length,
+        enabledCount: plugins.filter((p) => p.enabled).length,
+        mcpPluginCount: Object.keys(mcpData.fromPlugins).length,
+        mcpCustomCount: Object.keys(mcpData.fromSettings).length,
+        mcpCount: Object.keys(mcpData.all).length
+      });
+    } catch {
+      setInfoData(EMPTY_INFO);
+    }
+  }, [listInstancePlugins2, getInstanceMcpServers2]);
+  use_input_default((input, key) => {
+    if (executing)
+      return;
+    if (input === "q") {
+      exit();
+      return;
+    }
+    if (key.escape) {
+      if (step === "info") {
+        setStep("select");
+        setSelected(null);
+      } else if (step === "actions") {
+        setStep("info");
+      } else if (step === "result") {
+        goToInfo();
+      } else {
+        onBack();
+      }
+    } else if (key.return) {
+      if (step === "info") {
+        setStep("actions");
+      } else if (step === "result") {
+        goToInfo();
+      }
     }
   });
+  const goToInfo = () => {
+    const inst = liveSelected;
+    if (inst) {
+      runDiagnostics(inst);
+      loadInstanceInfo(inst);
+    }
+    setStep("info");
+  };
   if (instances2.length === 0) {
     return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
       flexDirection: "column",
@@ -57425,20 +57685,62 @@ var import_react69, jsx_dev_runtime10, DetailRow = ({
       return;
     setSelected(inst);
     setStep("info");
+    runDiagnostics(inst);
+    await loadInstanceInfo(inst);
+  };
+  const handleAction = async (value) => {
+    if (executing)
+      return;
+    if (value === ACTION_VALUES.Back || !selected) {
+      setStep("info");
+      return;
+    }
+    setActionResult(null);
+    setExecuting(true);
+    setStep("executing");
     try {
-      const plugins = listInstancePlugins2(inst.configDir);
-      const mcpData = await getInstanceMcpServers2(inst.configDir);
-      setInfoData({
-        pluginCount: plugins.length,
-        enabledCount: plugins.filter((p) => p.enabled).length,
-        mcpPluginCount: Object.keys(mcpData.fromPlugins).length,
-        mcpCustomCount: Object.keys(mcpData.fromSettings).length,
-        mcpCount: Object.keys(mcpData.all).length
+      if (value === ACTION_VALUES.SyncTemplate) {
+        await syncTemplateEnv(liveSelected ?? selected);
+        setActionResult({ message: `Settings template updated for '${selected.name}'`, type: "success" });
+      } else if (value === ACTION_VALUES.UpdateWrapper || value === ACTION_VALUES.OverrideWrapper) {
+        await regenerateWrapper(liveSelected ?? selected);
+        setActionResult({ message: `Alias wrapper regenerated for '${selected.name}'`, type: "success" });
+      }
+    } catch (err) {
+      setActionResult({
+        message: err instanceof Error ? err.message : String(err),
+        type: "error"
+      });
+    }
+    setExecuting(false);
+    setStep("result");
+  };
+  const buildActionOptions = () => {
+    const options = [];
+    if (providerName) {
+      options.push({
+        label: `\uD83D\uDD04 Update settings template  [${templateStatusLabel(templateStatus)}]`,
+        value: ACTION_VALUES.SyncTemplate
+      });
+    }
+    options.push({
+      label: `\uD83D\uDD27 Update alias wrapper  [${wrapperStatusLabel(wrapperStatus)}]`,
+      value: ACTION_VALUES.UpdateWrapper
+    });
+    if (wrapperStatus === "mismatch" || wrapperStatus === "missing") {
+      options.push({
+        label: `\uD83D\uDD28 Override alias to standard`,
+        value: ACTION_VALUES.OverrideWrapper
       });
-    } catch {
-      setInfoData(EMPTY_INFO);
     }
+    options.push({ label: "← Back", value: ACTION_VALUES.Back });
+    return options;
   };
+  const hasPlugins = infoData.pluginCount !== null;
+  const hasMcp = infoData.mcpCount !== null;
+  const hasProvider = providerName !== null;
+  const lastRow = hasMcp ? "mcp" : hasPlugins ? "plugins" : hasProvider ? "provider" : "version";
+  const displayInstance = liveSelected ?? selected;
   return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
     flexDirection: "column",
     width: "100",
@@ -57452,7 +57754,7 @@ var import_react69, jsx_dev_runtime10, DetailRow = ({
         instances: instances2,
         onSelect: handleInstanceSelect
       }, undefined, false, undefined, this),
-      step === "info" && selected && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+      step === "info" && displayInstance && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
         flexDirection: "column",
         gap: 0,
         children: [
@@ -57466,7 +57768,7 @@ var import_react69, jsx_dev_runtime10, DetailRow = ({
               /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
                 bold: true,
                 color: "cyan",
-                children: selected.name
+                children: displayInstance.name
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
@@ -57476,53 +57778,186 @@ var import_react69, jsx_dev_runtime10, DetailRow = ({
             children: [
               /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(DetailRow, {
                 label: "Binary",
-                value: selected.binaryPath,
+                value: displayInstance.binaryPath,
                 delay: 50
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(DetailRow, {
                 label: "Config",
-                value: selected.configDir,
+                value: displayInstance.configDir,
                 delay: 100
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(DetailRow, {
                 label: "Created",
-                value: new Date(selected.createdAt).toLocaleString(),
+                value: new Date(displayInstance.createdAt).toLocaleString(),
                 delay: 150
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(DetailRow, {
                 label: "Auto-sync",
-                value: selected.autoSync !== false ? "✓ Enabled" : "✗ Disabled",
-                color: selected.autoSync !== false ? "green" : "red",
+                value: displayInstance.autoSync !== false ? "✓ Enabled" : "✗ Disabled",
+                color: displayInstance.autoSync !== false ? "green" : "red",
                 delay: 200
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(DetailRow, {
                 label: "Version",
-                value: selected.createdWithVersion === LEGACY_INSTANCE_VERSION ? "before version tracking" : selected.createdWithVersion,
-                color: selected.createdWithVersion === LEGACY_INSTANCE_VERSION ? "yellow" : undefined,
+                value: displayInstance.createdWithVersion === LEGACY_INSTANCE_VERSION ? "before version tracking" : displayInstance.createdWithVersion,
+                color: displayInstance.createdWithVersion === LEGACY_INSTANCE_VERSION ? "yellow" : undefined,
+                last: lastRow === "version",
                 delay: 250
               }, undefined, false, undefined, this),
-              infoData.pluginCount !== null && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(DetailRow, {
+              hasProvider && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(DetailRow, {
+                label: "Provider",
+                value: providerName,
+                color: templateStatus === "match" ? undefined : templateStatus === "mismatch" ? "yellow" : undefined,
+                last: lastRow === "provider",
+                delay: 275
+              }, undefined, false, undefined, this),
+              hasPlugins && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(DetailRow, {
                 label: "Plugins",
                 value: `${infoData.pluginCount} installed, ${infoData.enabledCount} enabled`,
+                last: lastRow === "plugins",
                 delay: 300
               }, undefined, false, undefined, this),
-              infoData.mcpCount !== null && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(DetailRow, {
+              hasMcp && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(DetailRow, {
                 label: "MCP Servers",
                 value: `${infoData.mcpCount} total (${infoData.mcpPluginCount} from plugins, ${infoData.mcpCustomCount} custom)`,
-                last: true,
+                last: lastRow === "mcp",
                 delay: 350
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this)
         ]
       }, undefined, true, undefined, this),
+      step === "actions" && displayInstance && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+        flexDirection: "column",
+        gap: 1,
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+            gap: 1,
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                color: "cyan",
+                children: "●"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                bold: true,
+                color: "cyan",
+                children: displayInstance.name
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+            marginTop: 1,
+            children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+              bold: true,
+              children: "Actions:"
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this),
+          (() => {
+            const actionOptions = buildActionOptions();
+            return /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Select, {
+              options: actionOptions,
+              visibleOptionCount: actionOptions.length,
+              onChange: handleAction
+            }, undefined, false, undefined, this);
+          })()
+        ]
+      }, undefined, true, undefined, this),
+      step === "executing" && displayInstance && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+        flexDirection: "column",
+        gap: 1,
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+            gap: 1,
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                color: "cyan",
+                children: "●"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                bold: true,
+                color: "cyan",
+                children: displayInstance.name
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+            marginTop: 1,
+            children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Spinner, {
+              label: "Updating..."
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
+      step === "result" && displayInstance && actionResult && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+        flexDirection: "column",
+        gap: 1,
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+            gap: 1,
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                color: "cyan",
+                children: "●"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                bold: true,
+                color: "cyan",
+                children: displayInstance.name
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+            marginTop: 1,
+            children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(StatusBar, {
+              message: actionResult.message,
+              type: actionResult.type
+            }, undefined, false, undefined, this)
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
-          dimColor: true,
-          children: "ESC to go back"
-        }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this)
+        children: [
+          step === "info" && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+            gap: 2,
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                dimColor: true,
+                children: "Enter for actions"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                dimColor: true,
+                children: "ESC to go back"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                dimColor: true,
+                children: "q quit"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          step === "actions" && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+            dimColor: true,
+            children: "↑↓ navigate │ Enter select │ ESC back │ q quit"
+          }, undefined, false, undefined, this),
+          step === "result" && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Box_default, {
+            gap: 2,
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                dimColor: true,
+                children: "Enter/ESC to return"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+                dimColor: true,
+                children: "q quit"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          step === "select" && /* @__PURE__ */ jsx_dev_runtime10.jsxDEV(Text, {
+            dimColor: true,
+            children: "ESC to go back │ q quit"
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this)
     ]
   }, undefined, true, undefined, this);
 };
@@ -57530,10 +57965,12 @@ var init_ShowInstanceInfo = __esm(async () => {
   init_useConfig();
   init_useAnimations();
   init_migration();
+  init_instance_diagnostics();
   await __promiseAll([
     init_build2(),
+    init_build3(),
     init_Header(),
-    init_useNavigation(),
+    init_StatusBar(),
     init_InstanceSelectMenu()
   ]);
   import_react69 = __toESM(require_react(), 1);
@@ -57545,6 +57982,12 @@ var init_ShowInstanceInfo = __esm(async () => {
     mcpPluginCount: null,
     mcpCustomCount: null
   };
+  ACTION_VALUES = {
+    SyncTemplate: "sync-template",
+    UpdateWrapper: "update-wrapper",
+    OverrideWrapper: "override-wrapper",
+    Back: "back"
+  };
 });
 
 // src/ink/screens/RemoveInstance.tsx
@@ -58965,61 +59408,8 @@ var init_ManageMcp = __esm(async () => {
   };
 });
 
-// src/ink/components/IssueCard.tsx
-var jsx_dev_runtime16, SEVERITY_ICONS, SEVERITY_COLORS, IssueCard = ({
-  issue,
-  index
-}) => {
-  const visible = useFadeIn(index * 60 + 50);
-  if (!visible)
-    return null;
-  const icon = SEVERITY_ICONS[issue.severity] ?? "•";
-  const color = SEVERITY_COLORS[issue.severity] ?? "white";
-  return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
-    flexDirection: "column",
-    marginLeft: 2,
-    children: [
-      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
-        gap: 1,
-        children: [
-          /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
-            children: icon
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
-            bold: true,
-            color,
-            children: issue.title
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
-        marginLeft: 2,
-        children: /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
-          dimColor: true,
-          children: issue.message
-        }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this)
-    ]
-  }, undefined, true, undefined, this);
-};
-var init_IssueCard = __esm(async () => {
-  init_useAnimations();
-  await init_build2();
-  jsx_dev_runtime16 = __toESM(require_jsx_dev_runtime(), 1);
-  SEVERITY_ICONS = {
-    error: "❌",
-    warning: "⚠",
-    info: "ℹ️"
-  };
-  SEVERITY_COLORS = {
-    error: "red",
-    warning: "yellow",
-    info: "gray"
-  };
-});
-
 // src/ink/screens/HealthScreen.tsx
-var import_react76, jsx_dev_runtime17, HealthScreen = ({
+var import_react76, jsx_dev_runtime16, SEVERITY_ICONS, HealthScreen = ({
   issues,
   onDismiss,
   onDismissAll,
@@ -59029,7 +59419,6 @@ var import_react76, jsx_dev_runtime17, HealthScreen = ({
 }) => {
   const [step, setStep] = import_react76.useState("list");
   const [selectedIssue, setSelectedIssue] = import_react76.useState(null);
-  const showActions = useFadeIn(100);
   useNavigation(() => {
     if (step === "detail") {
       setStep("list");
@@ -59039,38 +59428,39 @@ var import_react76, jsx_dev_runtime17, HealthScreen = ({
     }
   });
   use_input_default((input) => {
-    if (step !== "list")
-      return;
-    if (input === "d" && selectedIssue) {
-      onDismiss(selectedIssue.id);
-      setSelectedIssue(null);
-    } else if (input === "D") {
-      onDismissAll();
-    } else if (input === "r") {
-      onRetry();
-    } else if (input === "f") {
-      onFix();
-    } else if (input === " " && selectedIssue) {
-      setStep("detail");
+    if (step === "list") {
+      if (input === "D") {
+        onDismissAll();
+      } else if (input === "r") {
+        onRetry();
+      } else if (input === "f") {
+        onFix();
+      }
+    } else if (step === "detail" && selectedIssue) {
+      if (input === "d") {
+        onDismiss(selectedIssue.id);
+        setSelectedIssue(null);
+        setStep("list");
+      }
     }
   });
   if (issues.length === 0) {
-    return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
       flexDirection: "column",
       width: "100",
       paddingX: 2,
       paddingY: 1,
       children: [
-        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Header, {
+        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Header, {
           title: "\uD83D\uDC9A System Health"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(StatusBar, {
+        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(StatusBar, {
           message: "All systems healthy!",
           type: "success"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
           marginTop: 1,
-          children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+          children: /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
             dimColor: true,
             children: "ESC to go back"
           }, undefined, false, undefined, this)
@@ -59079,137 +59469,167 @@ var import_react76, jsx_dev_runtime17, HealthScreen = ({
     }, undefined, true, undefined, this);
   }
   const hasVersionIssues = issues.some((i) => i.category === "version");
-  return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+  const handleIssueSelect = (value) => {
+    const issue = issues.find((i) => i.id === value);
+    if (issue) {
+      setSelectedIssue(issue);
+      setStep("detail");
+    }
+  };
+  const issueOptions = issues.map((issue) => ({
+    label: `${SEVERITY_ICONS[issue.severity] ?? "•"} ${issue.title}`,
+    value: issue.id
+  }));
+  return /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
     flexDirection: "column",
     width: "100",
     paddingX: 2,
     paddingY: 1,
     children: [
-      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Header, {
+      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Header, {
         title: "⚠ System Health"
       }, undefined, false, undefined, this),
-      step === "list" && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+      step === "list" && /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
         flexDirection: "column",
         gap: 1,
         children: [
-          /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
             bold: true,
             children: [
               issues.length,
-              " issue(s) found:"
+              " issue(s) found — select one to view:"
             ]
           }, undefined, true, undefined, this),
-          issues.map((issue, i) => /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(IssueCard, {
-            issue,
-            index: i
-          }, issue.id, false, undefined, this)),
-          showActions && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Select, {
+            options: issueOptions,
+            visibleOptionCount: issueOptions.length,
+            onChange: handleIssueSelect
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
             marginTop: 1,
             flexDirection: "column",
             children: [
-              hasVersionIssues && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+              hasVersionIssues && /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
                 marginBottom: 1,
                 children: [
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     color: "cyan",
                     bold: true,
                     children: "f"
                   }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     color: "cyan",
                     children: " fix wrappers "
                   }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     dimColor: true,
                     children: "│"
                   }, undefined, false, undefined, this)
                 ]
               }, undefined, true, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+              /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                 dimColor: true,
-                children: "Space view detail │ d dismiss │ D dismiss all │ r retry │ ESC back"
+                children: "D dismiss all │ r retry │ ESC back"
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      step === "detail" && selectedIssue && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+      step === "detail" && selectedIssue && /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
         flexDirection: "column",
         gap: 1,
         children: [
-          /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
             bold: true,
             children: selectedIssue.title
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
             marginLeft: 2,
             flexDirection: "column",
             children: [
-              /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+              /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
                 gap: 1,
                 children: [
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     dimColor: true,
                     children: "├─"
                   }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     dimColor: true,
                     bold: true,
                     children: "Severity:"
                   }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     color: selectedIssue.severity === "error" ? "red" : "yellow",
                     children: selectedIssue.severity
                   }, undefined, false, undefined, this)
                 ]
               }, undefined, true, undefined, this),
-              selectedIssue.instanceName && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+              selectedIssue.instanceName && /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
                 gap: 1,
                 children: [
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     dimColor: true,
                     children: "├─"
                   }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     dimColor: true,
                     bold: true,
                     children: "Instance:"
                   }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     children: selectedIssue.instanceName
                   }, undefined, false, undefined, this)
                 ]
               }, undefined, true, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+              /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
                 gap: 1,
                 children: [
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     dimColor: true,
                     children: "├─"
                   }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     dimColor: true,
                     bold: true,
                     children: "Detail:"
                   }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     children: selectedIssue.message
                   }, undefined, false, undefined, this)
                 ]
               }, undefined, true, undefined, this),
-              selectedIssue.resolutionHint && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+              selectedIssue.detail && /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
                 gap: 1,
                 children: [
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+                    dimColor: true,
+                    children: "├─"
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+                    dimColor: true,
+                    bold: true,
+                    children: "Info:"
+                  }, undefined, false, undefined, this),
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
+                    dimColor: true,
+                    children: selectedIssue.detail
+                  }, undefined, false, undefined, this)
+                ]
+              }, undefined, true, undefined, this),
+              selectedIssue.resolutionHint && /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
+                gap: 1,
+                children: [
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     dimColor: true,
                     children: "└─"
                   }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     dimColor: true,
                     bold: true,
                     children: "Fix:"
                   }, undefined, false, undefined, this),
-                  /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+                  /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
                     dimColor: true,
                     children: selectedIssue.resolutionHint
                   }, undefined, false, undefined, this)
@@ -59217,18 +59637,18 @@ var import_react76, jsx_dev_runtime17, HealthScreen = ({
               }, undefined, true, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+          /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
             marginTop: 1,
-            children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+            children: /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
               dimColor: true,
               children: "d dismiss │ ESC back"
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Box_default, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
+        children: /* @__PURE__ */ jsx_dev_runtime16.jsxDEV(Text, {
           dimColor: true,
           children: "ESC to go back"
         }, undefined, false, undefined, this)
@@ -59237,16 +59657,20 @@ var import_react76, jsx_dev_runtime17, HealthScreen = ({
   }, undefined, true, undefined, this);
 };
 var init_HealthScreen = __esm(async () => {
-  init_useAnimations();
   await __promiseAll([
     init_build2(),
+    init_build3(),
     init_Header(),
     init_StatusBar(),
-    init_IssueCard(),
     init_useNavigation()
   ]);
   import_react76 = __toESM(require_react(), 1);
-  jsx_dev_runtime17 = __toESM(require_jsx_dev_runtime(), 1);
+  jsx_dev_runtime16 = __toESM(require_jsx_dev_runtime(), 1);
+  SEVERITY_ICONS = {
+    error: "❌",
+    warning: "⚠",
+    info: "ℹ️"
+  };
 });
 
 // src/ink/screens/UpdateScreen.tsx
@@ -59257,59 +59681,59 @@ function VersionCard({
   hasUpdate,
   failed
 }) {
-  return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
     flexDirection: "column",
     marginTop: 1,
     children: [
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
-        children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
+        children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
           bold: true,
           children: label
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
         marginLeft: 2,
         children: [
-          /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
             dimColor: true,
             children: "Current: "
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
             color: failed ? "red" : hasUpdate ? "yellow" : "green",
             children: current || (failed ? "check failed" : "not installed")
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
         marginLeft: 2,
         children: [
-          /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
             dimColor: true,
             children: "Latest:  "
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+          /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
             bold: true,
             children: latest || (failed ? "unreachable" : "unknown")
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      failed && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+      failed && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
         marginLeft: 2,
-        children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
           color: "red",
           children: "✗ Could not reach npm registry"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      !failed && hasUpdate && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+      !failed && hasUpdate && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
         marginLeft: 2,
-        children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
           color: "yellow",
           children: "▲ Update available"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      !failed && !hasUpdate && current && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+      !failed && !hasUpdate && current && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
         marginLeft: 2,
-        children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+        children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
           color: "green",
           children: "✓ Up to date"
         }, undefined, false, undefined, this)
@@ -59317,7 +59741,7 @@ function VersionCard({
     ]
   }, undefined, true, undefined, this);
 }
-var import_react77, jsx_dev_runtime18, UpdateScreen = ({ onBack }) => {
+var import_react77, jsx_dev_runtime17, UpdateScreen = ({ onBack }) => {
   const { exit } = use_app_default();
   const fadeIn = useFadeIn();
   const { error, success, setError, setSuccess, clear } = useMessage();
@@ -59390,41 +59814,41 @@ var import_react77, jsx_dev_runtime18, UpdateScreen = ({ onBack }) => {
     return null;
   if (step === "loading" || step === "check-failed") {
     const isFailed = step === "check-failed";
-    return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
       flexDirection: "column",
       width: "100",
       paddingX: 2,
       paddingY: 1,
       children: [
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Header, {
+        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Header, {
           title: "\uD83D\uDCE6 Updates"
         }, undefined, false, undefined, this),
-        isFailed ? /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(jsx_dev_runtime18.Fragment, {
+        isFailed ? /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(jsx_dev_runtime17.Fragment, {
           children: [
-            multiInfo && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(VersionCard, {
+            multiInfo && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(VersionCard, {
               label: "claude-multi",
               current: multiInfo.current || null,
               latest: multiInfo.latest,
               hasUpdate: multiInfo.updateAvailable,
               failed: !multiInfo.current && !multiInfo.latest
             }, undefined, false, undefined, this),
-            claudeInfo && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(VersionCard, {
+            claudeInfo && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(VersionCard, {
               label: "@anthropic-ai/claude-code",
               current: claudeInfo.current,
               latest: claudeInfo.latest,
               hasUpdate: claudeInfo.updateAvailable,
               failed: !claudeInfo.current && !claudeInfo.latest
             }, undefined, false, undefined, this),
-            error && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+            error && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
               marginTop: 1,
-              children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(StatusBar, {
+              children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(StatusBar, {
                 message: error,
                 type: "error"
               }, undefined, false, undefined, this)
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+            /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
               marginTop: 1,
-              children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Select, {
+              children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Select, {
                 options: [
                   { label: "\uD83D\uDD04 Retry", value: "recheck" },
                   { label: "↩️  Back to menu", value: "back" }
@@ -59442,9 +59866,9 @@ var import_react77, jsx_dev_runtime18, UpdateScreen = ({ onBack }) => {
               }, undefined, false, undefined, this)
             }, undefined, false, undefined, this)
           ]
-        }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+        }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
           marginTop: 1,
-          children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Spinner, {
+          children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Spinner, {
             label: "Checking for updates..."
           }, undefined, false, undefined, this)
         }, undefined, false, undefined, this)
@@ -59452,24 +59876,24 @@ var import_react77, jsx_dev_runtime18, UpdateScreen = ({ onBack }) => {
     }, undefined, true, undefined, this);
   }
   if (step === "updating") {
-    return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
       flexDirection: "column",
       width: "100",
       paddingX: 2,
       paddingY: 1,
       children: [
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Header, {
+        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Header, {
           title: "\uD83D\uDCE6 Updates"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
           marginTop: 1,
-          children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Spinner, {
+          children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Spinner, {
             label: `Updating ${updatingTarget === "multi" ? "claude-multi" : "@anthropic-ai/claude-code"}...`
           }, undefined, false, undefined, this)
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+        /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
           marginTop: 1,
-          children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
+          children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Text, {
             dimColor: true,
             children: "Do not press ESC: update in progress"
           }, undefined, false, undefined, this)
@@ -59488,44 +59912,44 @@ var import_react77, jsx_dev_runtime18, UpdateScreen = ({ onBack }) => {
   }
   actionOptions.push({ label: "\uD83D\uDD04 Re-check versions", value: "recheck" });
   actionOptions.push({ label: "↩️  Back to menu", value: "back" });
-  return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
     flexDirection: "column",
     width: "100",
     paddingX: 2,
     paddingY: 1,
     children: [
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Header, {
+      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Header, {
         title: "\uD83D\uDCE6 Updates"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(VersionCard, {
+      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(VersionCard, {
         label: "claude-multi",
         current: multiInfo?.current ?? null,
         latest: multiInfo?.latest ?? "",
         hasUpdate: multiUpdate
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(VersionCard, {
+      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(VersionCard, {
         label: "@anthropic-ai/claude-code",
         current: claudeInfo?.current ?? null,
         latest: claudeInfo?.latest ?? "",
         hasUpdate: claudeUpdate
       }, undefined, false, undefined, this),
-      error && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+      error && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(StatusBar, {
+        children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(StatusBar, {
           message: error,
           type: "error"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      success && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+      success && /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(StatusBar, {
+        children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(StatusBar, {
           message: success,
           type: "success"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Box_default, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Select, {
+        children: /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Select, {
           options: actionOptions,
           onChange: (value) => {
             if (value === "back") {
@@ -59543,7 +59967,7 @@ var import_react77, jsx_dev_runtime18, UpdateScreen = ({ onBack }) => {
           }
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Footer, {}, undefined, false, undefined, this)
+      /* @__PURE__ */ jsx_dev_runtime17.jsxDEV(Footer, {}, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 };
@@ -59559,7 +59983,7 @@ var init_UpdateScreen = __esm(async () => {
     init_Footer()
   ]);
   import_react77 = __toESM(require_react(), 1);
-  jsx_dev_runtime18 = __toESM(require_jsx_dev_runtime(), 1);
+  jsx_dev_runtime17 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
 // src/ink/App.tsx
@@ -59567,75 +59991,59 @@ var exports_App = {};
 __export(exports_App, {
   App: () => App2
 });
-import { execSync as execSync3 } from "node:child_process";
-import { existsSync as existsSync8 } from "node:fs";
-var import_react78, jsx_dev_runtime19, GoodbyeScreen = () => {
+var import_react78, jsx_dev_runtime18, GoodbyeScreen = () => {
   const msg = useTypewriter("\uD83D\uDC4B Goodbye!", 40);
-  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
     paddingX: 2,
     paddingY: 1,
-    children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+    children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
       dimColor: true,
       children: msg
     }, undefined, false, undefined, this)
   }, undefined, false, undefined, this);
-}, DoctorResultScreen = ({ fixedCount, migratedCount, installFailed, onBack }) => {
+}, DoctorResultScreen = ({ fixedCount, migratedCount, onBack }) => {
   useNavigation(onBack);
-  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
     flexDirection: "column",
     width: "100",
     paddingX: 2,
     paddingY: 1,
     children: [
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Header, {
-        title: "\uD83D\uDD27 Doctor Fix"
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Header, {
+        title: "Doctor Fix"
       }, undefined, false, undefined, this),
-      installFailed ? /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(jsx_dev_runtime19.Fragment, {
-        children: [
-          /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(StatusBar, {
-            message: "Failed to install pinned Claude binary",
-            type: "error"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
-            marginTop: 1,
-            children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-              dimColor: true,
-              children: "Check your network connection and try again."
-            }, undefined, false, undefined, this)
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this) : fixedCount > 0 || migratedCount > 0 ? /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(jsx_dev_runtime19.Fragment, {
+      fixedCount > 0 || migratedCount > 0 ? /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(jsx_dev_runtime18.Fragment, {
         children: [
-          fixedCount > 0 && /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(jsx_dev_runtime19.Fragment, {
+          fixedCount > 0 && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(jsx_dev_runtime18.Fragment, {
             children: [
-              /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(StatusBar, {
-                message: `Fixed ${fixedCount} wrapper(s) to use pinned Claude v${COMPATIBLE_CLAUDE_VERSION}!`,
+              /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(StatusBar, {
+                message: `Fixed ${fixedCount} wrapper(s) to use global Claude binary`,
                 type: "success"
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+              /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
                 marginTop: 1,
-                children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+                children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
                   dimColor: true,
-                  children: "All 3rd-party API instances now use the correct Claude binary."
+                  children: "All instances now use the globally installed Claude binary."
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          migratedCount > 0 && /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+          migratedCount > 0 && /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
             marginTop: fixedCount > 0 ? 1 : 0,
-            children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(StatusBar, {
+            children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(StatusBar, {
               message: `Migrated ${migratedCount} instance(s) to v${getClaudeMultiVersion()}`,
               type: "success"
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this)
         ]
-      }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(StatusBar, {
+      }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(StatusBar, {
         message: "All wrappers already use the correct Claude version",
         type: "info"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+        children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
           dimColor: true,
           children: "ESC to go back"
         }, undefined, false, undefined, this)
@@ -59646,9 +60054,9 @@ var import_react78, jsx_dev_runtime19, GoodbyeScreen = () => {
   const visible = useFadeIn(100);
   if (!visible || instances2.length === 0)
     return null;
-  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
     marginBottom: 1,
-    children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+    children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
       dimColor: true,
       children: [
         instances2.length,
@@ -59660,23 +60068,15 @@ var import_react78, jsx_dev_runtime19, GoodbyeScreen = () => {
   }, undefined, false, undefined, this);
 }, App2 = () => {
   const { exit } = use_app_default();
-  const { instances: instances2, loading, migrationStatus, instanceMigrationVersion } = useConfig();
+  const { instances: instances2, loading, migrationStatus, instanceMigrationVersion, reload } = useConfig();
   const { issues, dismiss, dismissAll, retry } = useHealthCheck(instances2, migrationStatus, instanceMigrationVersion);
   const [screen, setScreen] = import_react78.useState("menu");
   const [menuKey, setMenuKey] = import_react78.useState(0);
-  const [ccVersion] = import_react78.useState(() => {
-    try {
-      const output = execSync3("claude --version 2>/dev/null", { encoding: "utf-8", timeout: 5000 }).trim();
-      return output.split(" ")[0] || null;
-    } catch {
-      return null;
-    }
-  });
   const [doctorResult, setDoctorResult] = import_react78.useState({
     fixedCount: 0,
-    migratedCount: 0,
-    installFailed: false
+    migratedCount: 0
   });
+  const [doctorRunning, setDoctorRunning] = import_react78.useState(false);
   use_input_default((input, key) => {
     if (screen !== "menu")
       return;
@@ -59688,10 +60088,10 @@ var import_react78, jsx_dev_runtime19, GoodbyeScreen = () => {
     }
   });
   if (loading) {
-    return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+    return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
       paddingX: 2,
       paddingY: 1,
-      children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Spinner, {
+      children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Spinner, {
         label: "Loading..."
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this);
@@ -59701,45 +60101,35 @@ var import_react78, jsx_dev_runtime19, GoodbyeScreen = () => {
     setMenuKey((k) => k + 1);
   };
   const handleDoctorFix = async () => {
-    let installFailed = false;
-    if (!existsSync8(PINNED_CLAUDE_BIN)) {
+    if (doctorRunning)
+      return;
+    setDoctorRunning(true);
+    try {
+      const fixed = fixWrapperVersions(instances2);
+      let migrated = 0;
       try {
-        installPinnedClaude();
-      } catch {
-        installFailed = true;
-      }
-    } else {
-      const pinnedVer = getPinnedBinaryVersion();
-      if (pinnedVer && isThirdPartyApiBroken(pinnedVer)) {
-        try {
-          installPinnedClaude();
-        } catch {
-          installFailed = true;
+        const fullConfig = await loadConfig();
+        if (needsInstanceMigration(fullConfig)) {
+          const before2 = fullConfig.instanceMigrationVersion;
+          const migratedConfig = await runInstanceMigrations(fullConfig);
+          if (migratedConfig.instanceMigrationVersion !== before2) {
+            await saveConfigAtomic(migratedConfig);
+            migrated = fullConfig.instances.length;
+          }
         }
-      }
+      } catch {}
+      setDoctorResult({ fixedCount: fixed.length, migratedCount: migrated });
+      await reload();
+      setScreen("doctor-result");
+    } finally {
+      setDoctorRunning(false);
     }
-    const fixed = installFailed ? [] : fixWrapperVersions(instances2);
-    let migrated = 0;
-    try {
-      const fullConfig = await loadConfig();
-      if (needsInstanceMigration(fullConfig)) {
-        const before2 = fullConfig.instanceMigrationVersion;
-        const migratedConfig = await runInstanceMigrations(fullConfig);
-        if (migratedConfig.instanceMigrationVersion !== before2) {
-          await saveConfigAtomic(migratedConfig);
-          migrated = fullConfig.instances.length;
-        }
-      }
-    } catch {}
-    setDoctorResult({ fixedCount: fixed.length, migratedCount: migrated, installFailed });
-    retry();
-    setScreen("doctor-result");
   };
   if (screen === "goodbye") {
-    return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(GoodbyeScreen, {}, undefined, false, undefined, this);
+    return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(GoodbyeScreen, {}, undefined, false, undefined, this);
   }
   if (screen === "health") {
-    return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(HealthScreen, {
+    return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(HealthScreen, {
       issues,
       onDismiss: dismiss,
       onDismissAll: dismissAll,
@@ -59749,17 +60139,16 @@ var import_react78, jsx_dev_runtime19, GoodbyeScreen = () => {
     }, undefined, false, undefined, this);
   }
   if (screen === "doctor-result") {
-    return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(DoctorResultScreen, {
+    return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(DoctorResultScreen, {
       fixedCount: doctorResult.fixedCount,
       migratedCount: doctorResult.migratedCount,
-      installFailed: doctorResult.installFailed,
       onBack: goToMenu
     }, undefined, false, undefined, this);
   }
   if (screen !== "menu") {
     const ScreenComponent = SCREEN_MAP[screen];
     if (ScreenComponent) {
-      return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(ScreenComponent, {
+      return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(ScreenComponent, {
         onBack: goToMenu
       }, undefined, false, undefined, this);
     }
@@ -59790,44 +60179,26 @@ var import_react78, jsx_dev_runtime19, GoodbyeScreen = () => {
     { label: "\uD83D\uDCE6 Check for updates", value: "update" },
     { label: "\uD83D\uDEAA Exit", value: "exit" }
   ];
-  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+  return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
     flexDirection: "column",
     width: "100",
     paddingX: 2,
     paddingY: 1,
     children: [
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Header, {
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Header, {
         title: "\uD83E\uDD16 Claude Multi",
         subtitle: "Interactive Mode"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(WarningBanner, {
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(WarningBanner, {
         issueCount: issues.length,
         errorCount,
         warningCount,
         hasVersionIssues
       }, undefined, false, undefined, this),
-      ccVersion && isThirdPartyApiBroken(ccVersion) && /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
-        marginBottom: 1,
-        children: [
-          /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-            color: "red",
-            bold: true,
-            children: [
-              "⚠ Claude Code v",
-              ccVersion,
-              " does not work with 3rd-party APIs. "
-            ]
-          }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-            color: "red",
-            children: "Run 'claude-multi doctor fix' to install a compatible version."
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(InstanceLine, {
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(InstanceLine, {
         instances: instances2
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Select, {
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Select, {
         options: menuOptions,
         visibleOptionCount: menuOptions.length,
         onChange: async (value) => {
@@ -59843,7 +60214,7 @@ var import_react78, jsx_dev_runtime19, GoodbyeScreen = () => {
           }
         }
       }, menuKey, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Footer, {
+      /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Footer, {
         showHealthHint: issues.length > 0
       }, undefined, false, undefined, this)
     ]
@@ -59851,7 +60222,6 @@ var import_react78, jsx_dev_runtime19, GoodbyeScreen = () => {
 }, SCREEN_MAP;
 var init_App2 = __esm(async () => {
   init_version();
-  init_paths();
   init_useConfig();
   init_useHealthCheck();
   init_useAnimations();
@@ -59878,7 +60248,7 @@ var init_App2 = __esm(async () => {
     init_UpdateScreen()
   ]);
   import_react78 = __toESM(require_react(), 1);
-  jsx_dev_runtime19 = __toESM(require_jsx_dev_runtime(), 1);
+  jsx_dev_runtime18 = __toESM(require_jsx_dev_runtime(), 1);
   SCREEN_MAP = {
     add: AddInstance,
     list: ListInstances,
@@ -59919,7 +60289,7 @@ init_errors();
 init_constants();
 var import_prompts = __toESM(require_prompts3(), 1);
 import { homedir as homedir4 } from "node:os";
-import { join as join9 } from "node:path";
+import { join as join9, dirname as dirname5, delimiter } from "node:path";
 function exitWithCode(code) {
   process.exit(code);
 }
@@ -59956,6 +60326,7 @@ program2.command("add <name>").description("Add a new Claude Code instance").opt
     let providerTemplate = null;
     let apiKey = "";
     let autoSync = !options.manual;
+    let providerRegion;
     if (options.provider) {
       providerTemplate = getProviderTemplate(options.provider);
       if (!providerTemplate) {
@@ -59970,12 +60341,19 @@ program2.command("add <name>").description("Add a new Claude Code instance").opt
       useProviderTemplate = true;
       if (providerHasRegions(providerTemplate.name)) {
         const region = options.region || "cn";
+        if (!options.region) {
+          const regions = getProviderRegions(providerTemplate.name);
+          console.log(source_default.yellow(`⚠ No --region specified, defaulting to cn. Available: ${regions ? Object.keys(regions).join(", ") : "cn"}`));
+        }
+        providerRegion = region;
         try {
           providerTemplate = resolveRegionTemplate(providerTemplate, region);
         } catch (err) {
           console.error(source_default.red(`✗ ${toMessage(err)}`));
           exitWithCode(1);
         }
+      } else if (options.region) {
+        console.log(source_default.yellow(`⚠ --region is ignored for non-regional provider '${providerTemplate.name}'`));
       }
     }
     if (options.copySettings || options.copyAll || options.copyMcp || options.skipPrompts || options.provider) {
@@ -60040,7 +60418,9 @@ Found existing Claude Code configuration at ~/.claude`));
       binaryPath,
       createdAt: new Date().toISOString(),
       autoSync,
-      createdWithVersion: getClaudeMultiVersion()
+      createdWithVersion: getClaudeMultiVersion(),
+      ...useProviderTemplate && providerTemplate ? { providerTemplate: providerTemplate.name } : {},
+      ...providerRegion ? { providerRegion } : {}
     };
     await addInstance(instance);
     try {
@@ -60080,9 +60460,9 @@ Found existing Claude Code configuration at ~/.claude`));
     console.log(source_default.gray(`  Binary: ${binaryPath}`));
     console.log(source_default.gray(`  Config: ${configDir}`));
     console.log();
-    const binDir = binaryPath.substring(0, binaryPath.lastIndexOf("/"));
+    const binDir = dirname5(binaryPath);
     const pathEnv = process.env.PATH || "";
-    const isInPath = pathEnv.split(":").some((p) => p === binDir);
+    const isInPath = pathEnv.split(delimiter).some((p) => p === binDir);
     if (!isInPath) {
       console.log(source_default.yellow(`⚠ Warning: ${binDir} is not in your PATH`));
       console.log(source_default.gray(`Add to PATH by running:`));
@@ -60136,6 +60516,10 @@ program2.command("list").alias("ls").description("List all Claude Code instances
       console.log(source_default.gray(`  Binary:  ${instance.binaryPath}`));
       console.log(source_default.gray(`  Config:  ${instance.configDir}`));
       console.log(source_default.gray(`  Created: ${new Date(instance.createdAt).toLocaleString()}`));
+      if (instance.providerTemplate) {
+        const region = instance.providerRegion ? ` (${instance.providerRegion})` : "";
+        console.log(source_default.gray(`  Provider: ${instance.providerTemplate}${region}`));
+      }
       const autoSyncStatus = instance.autoSync !== false ? source_default.green("on") : source_default.yellow("off");
       console.log(source_default.gray(`  Auto-sync: ${autoSyncStatus}`));
       console.log(source_default.gray(`  Version:  ${formatVersionLabel(instance.createdWithVersion)}`));
@@ -60157,6 +60541,10 @@ program2.command("info <name>").description("Show details about a specific insta
     const autoSyncStatus = instance.autoSync !== false ? source_default.green("✓ Enabled") : source_default.yellow("✗ Disabled");
     console.log(`${source_default.gray("Auto-sync:")} ${autoSyncStatus}`);
     console.log(`${source_default.gray("Version:")}  ${formatVersionLabel(instance.createdWithVersion)}`);
+    if (instance.providerTemplate) {
+      const region = instance.providerRegion ? ` (${instance.providerRegion})` : "";
+      console.log(`${source_default.gray("Provider:")} ${instance.providerTemplate}${region}`);
+    }
   } catch (error) {
     console.error(source_default.red(`✗ Error: ${toMessage(error)}`));
     exitWithCode(1);
@@ -60232,17 +60620,13 @@ program2.command("doctor").description("Diagnose and fix common issues").argumen
     const [
       instances2,
       { runHealthChecks: runHealthChecks2, fixWrapperVersions: fixWrapperVersions2 },
-      { existsSync: existsSync9 },
-      { PINNED_CLAUDE_BIN: PINNED_CLAUDE_BIN2 },
-      { installPinnedClaude: installPinnedClaude2, getPinnedBinaryVersion: getPinnedBinaryVersion2, isThirdPartyApiBroken: isThirdPartyApiBroken2, COMPATIBLE_CLAUDE_VERSION: COMPATIBLE_CLAUDE_VERSION2 },
+      { tryGetClaudePath: tryGetClaudePath2 },
       { needsInstanceMigration: needsInstanceMigration2, runInstanceMigrations: runInstanceMigrations2 },
       { loadConfig: loadConfig2, saveConfigAtomic: saveConfigAtomic2 }
     ] = await Promise.all([
       listInstances(),
       Promise.resolve().then(() => (init_health(), exports_health)),
-      import("node:fs"),
-      Promise.resolve().then(() => (init_paths(), exports_paths)),
-      Promise.resolve().then(() => (init_version(), exports_version)),
+      Promise.resolve().then(() => (init_wrapper(), exports_wrapper)),
       Promise.resolve().then(() => (init_migration(), exports_migration)),
       Promise.resolve().then(() => (init_config(), exports_config))
     ]);
@@ -60250,23 +60634,15 @@ program2.command("doctor").description("Diagnose and fix common issues").argumen
       console.log(source_default.bold(`
 \uD83D\uDD27 Doctor Fix
 `));
-      if (!existsSync9(PINNED_CLAUDE_BIN2)) {
-        console.log(source_default.cyan(`Installing compatible Claude v${COMPATIBLE_CLAUDE_VERSION2}...`));
-        installPinnedClaude2();
-        console.log(source_default.green(`✓ Installed pinned Claude v${COMPATIBLE_CLAUDE_VERSION2}`));
-      } else {
-        const pinnedVer = getPinnedBinaryVersion2();
-        const needsReinstall = !pinnedVer || isThirdPartyApiBroken2(pinnedVer) || pinnedVer !== COMPATIBLE_CLAUDE_VERSION2;
-        if (needsReinstall) {
-          const reason = !pinnedVer ? "version unknown" : isThirdPartyApiBroken2(pinnedVer) ? "incompatible" : "outdated";
-          console.log(source_default.yellow(`Pinned binary is ${pinnedVer ? `v${pinnedVer}` : reason}. Reinstalling v${COMPATIBLE_CLAUDE_VERSION2}...`));
-          installPinnedClaude2();
-          console.log(source_default.green(`✓ Reinstalled pinned Claude v${COMPATIBLE_CLAUDE_VERSION2}`));
-        }
+      const claudePath = tryGetClaudePath2();
+      if (!claudePath) {
+        console.error(source_default.red("Claude Code not found in PATH. Please install it first."));
+        process.exit(1);
       }
+      console.log(source_default.gray(`Using claude at: ${claudePath}`));
       const fixed = fixWrapperVersions2(instances2);
       if (fixed.length > 0) {
-        console.log(source_default.green(`✓ Fixed ${fixed.length} wrapper(s) to use pinned Claude version:`));
+        console.log(source_default.green(`✓ Fixed ${fixed.length} wrapper(s) to use resolved Claude version:`));
         for (const name of fixed) {
           console.log(source_default.gray(`  • ${name}`));
         }