@makerbi/openclaude 0.14.9 → 0.15.1

package/dist/cli.mjs

@@ -18728,7 +18728,7 @@ var init_codexOAuthShared = __esm(() => {
 });
 
 // src/utils/codexCredentials.ts
-function getCodexSecureStorage() {
+function getCodexPrimarySecureStorage() {
   return getSecureStorage({ allowPlainTextFallback: false });
 }
 function parseJwtExpiryMs(token) {
@@ -18766,6 +18766,69 @@ function normalizeCodexCredentialBlob(value) {
     lastRefreshFailureAt
   };
 }
+function getRecord(data) {
+  return data && typeof data === "object" ? data : {};
+}
+function hasStoredCodexRecord(data) {
+  return Object.prototype.hasOwnProperty.call(getRecord(data), CODEX_STORAGE_KEY);
+}
+function hasNonCodexStorageFields(data) {
+  return Object.keys(getRecord(data)).some((key) => key !== CODEX_STORAGE_KEY);
+}
+function readCodexFromPlainTextStorage() {
+  try {
+    const data = plainTextStorage.read();
+    return normalizeCodexCredentialBlob(data?.[CODEX_STORAGE_KEY]);
+  } catch {
+    return;
+  }
+}
+async function readCodexFromPlainTextStorageAsync() {
+  try {
+    const data = await plainTextStorage.readAsync();
+    return normalizeCodexCredentialBlob(data?.[CODEX_STORAGE_KEY]);
+  } catch {
+    return;
+  }
+}
+function writeCodexToPlainTextStorage(codex) {
+  try {
+    const previous = plainTextStorage.read() || {};
+    const next = {
+      ...getRecord(previous),
+      [CODEX_STORAGE_KEY]: codex
+    };
+    return plainTextStorage.update(next);
+  } catch {
+    return { success: false };
+  }
+}
+function removeCodexFromPlainTextStorage() {
+  try {
+    const previous = plainTextStorage.read();
+    if (!hasStoredCodexRecord(previous)) {
+      return { success: true };
+    }
+    const next = { ...getRecord(previous) };
+    delete next[CODEX_STORAGE_KEY];
+    if (Object.keys(next).length === 0) {
+      return plainTextStorage.delete() ? { success: true } : {
+        success: false,
+        warning: CODEX_PLAINTEXT_CLEANUP_FAILED_WARNING
+      };
+    }
+    const result = plainTextStorage.update(next);
+    return result.success ? { success: true } : {
+      success: false,
+      warning: result.warning ?? CODEX_PLAINTEXT_CLEANUP_FAILED_WARNING
+    };
+  } catch {
+    return {
+      success: false,
+      warning: CODEX_PLAINTEXT_CLEANUP_FAILED_WARNING
+    };
+  }
+}
 function shouldRefreshCodexToken(blob) {
   const expiresAt = parseJwtExpiryMs(blob.accessToken) ?? parseJwtExpiryMs(blob.idToken);
   if (expiresAt === undefined) {
@@ -18798,21 +18861,23 @@ function readCodexCredentials() {
   if (isBareMode())
     return;
   try {
-    const data = getCodexSecureStorage().read();
-    return normalizeCodexCredentialBlob(data?.codex);
-  } catch {
-    return;
-  }
+    const data = getCodexPrimarySecureStorage().read();
+    const primaryCodex = normalizeCodexCredentialBlob(data?.codex);
+    if (primaryCodex)
+      return primaryCodex;
+  } catch {}
+  return readCodexFromPlainTextStorage();
 }
 async function readCodexCredentialsAsync() {
   if (isBareMode())
     return;
   try {
-    const data = await getCodexSecureStorage().readAsync();
-    return normalizeCodexCredentialBlob(data?.codex);
-  } catch {
-    return;
-  }
+    const data = await getCodexPrimarySecureStorage().readAsync();
+    const primaryCodex = normalizeCodexCredentialBlob(data?.codex);
+    if (primaryCodex)
+      return primaryCodex;
+  } catch {}
+  return readCodexFromPlainTextStorageAsync();
 }
 function isCodexRefreshFailureCoolingDown(blob, now = Date.now()) {
   return isWithinRefreshFailureCooldown(blob, now);
@@ -18825,11 +18890,12 @@ function saveCodexCredentials(credentials) {
   if (!normalized) {
     return { success: false, warning: "Codex credentials are incomplete." };
   }
-  const secureStorage = getCodexSecureStorage();
-  const previous = secureStorage.read() || {};
-  const previousCodex = normalizeCodexCredentialBlob(previous[CODEX_STORAGE_KEY]);
+  const secureStorage = getCodexPrimarySecureStorage();
+  const previous = secureStorage.read();
+  const previousNativeCodex = normalizeCodexCredentialBlob(previous?.[CODEX_STORAGE_KEY]);
+  const previousCodex = previousNativeCodex ?? readCodexFromPlainTextStorage();
   const next = {
-    ...previous,
+    ...getRecord(previous),
     [CODEX_STORAGE_KEY]: {
       ...normalized,
       profileId: normalized.profileId ?? previousCodex?.profileId,
@@ -18840,8 +18906,37 @@ function saveCodexCredentials(credentials) {
   if (result.success) {
     const storedCodex = normalizeCodexCredentialBlob(next[CODEX_STORAGE_KEY]);
     inMemoryLastRefreshFailureAt = storedCodex?.lastRefreshFailureAt ?? null;
+    const cleanupResult = removeCodexFromPlainTextStorage();
+    if (!cleanupResult.success) {
+      return {
+        success: true,
+        warning: cleanupResult.warning ?? CODEX_PLAINTEXT_CLEANUP_FAILED_WARNING
+      };
+    }
+    return result;
   }
-  return result;
+  if (previousNativeCodex && hasNonCodexStorageFields(previous)) {
+    return result;
+  }
+  const fallbackResult = writeCodexToPlainTextStorage(next[CODEX_STORAGE_KEY]);
+  if (fallbackResult.success) {
+    if (previousNativeCodex && !secureStorage.delete()) {
+      return {
+        success: false,
+        warning: CODEX_FALLBACK_NATIVE_DELETE_FAILED_WARNING
+      };
+    }
+    if (!previousNativeCodex && !hasNonCodexStorageFields(previous)) {
+      secureStorage.delete();
+    }
+    const storedCodex = normalizeCodexCredentialBlob(next[CODEX_STORAGE_KEY]);
+    inMemoryLastRefreshFailureAt = storedCodex?.lastRefreshFailureAt ?? null;
+    return {
+      success: true,
+      warning: fallbackResult.warning
+    };
+  }
+  return fallbackResult.warning ? fallbackResult : result;
 }
 function persistCodexRefreshFailure(credentials, occurredAt) {
   const result = saveCodexCredentials({
@@ -18856,14 +18951,27 @@ function clearCodexCredentials() {
   if (isBareMode()) {
     return { success: true };
   }
-  const secureStorage = getCodexSecureStorage();
-  const previous = secureStorage.read() || {};
-  const next = { ...previous };
+  const secureStorage = getCodexPrimarySecureStorage();
+  const previous = secureStorage.read();
+  const previousCodex = normalizeCodexCredentialBlob(previous?.[CODEX_STORAGE_KEY]);
+  if (!previousCodex) {
+    const plaintextResult2 = removeCodexFromPlainTextStorage();
+    if (plaintextResult2.success) {
+      inMemoryLastRefreshFailureAt = null;
+    }
+    return plaintextResult2;
+  }
+  const next = { ...getRecord(previous) };
   delete next[CODEX_STORAGE_KEY];
   const result = secureStorage.update(next);
-  if (result.success) {
-    inMemoryLastRefreshFailureAt = null;
+  if (!result.success) {
+    return result;
+  }
+  const plaintextResult = removeCodexFromPlainTextStorage();
+  if (!plaintextResult.success) {
+    return plaintextResult;
   }
+  inMemoryLastRefreshFailureAt = null;
   return result;
 }
 async function refreshCodexAccessTokenIfNeeded(options) {
@@ -18877,7 +18985,8 @@ async function refreshCodexAccessTokenIfNeeded(options) {
   if (!current) {
     return { refreshed: false };
   }
-  if (!current.refreshToken) {
+  const refreshToken = current.refreshToken;
+  if (!refreshToken) {
     return { refreshed: false, credentials: current };
   }
   if (!options?.force && !shouldRefreshCodexToken(current)) {
@@ -18895,7 +19004,7 @@ async function refreshCodexAccessTokenIfNeeded(options) {
       const body = new URLSearchParams({
         client_id: getCodexOAuthClientId(),
         grant_type: "refresh_token",
-        refresh_token: current.refreshToken
+        refresh_token: refreshToken
       });
       const { signal, cleanup } = createCombinedAbortSignal(undefined, {
         timeoutMs: 15000
@@ -18952,11 +19061,12 @@ async function refreshCodexAccessTokenIfNeeded(options) {
   })();
   return inFlightCodexRefresh;
 }
-var CODEX_STORAGE_KEY = "codex", CODEX_TOKEN_REFRESH_SKEW_MS = 60000, CODEX_TOKEN_REFRESH_RETRY_COOLDOWN_MS = 60000, inFlightCodexRefresh = null, inMemoryLastRefreshFailureAt = null;
+var CODEX_STORAGE_KEY = "codex", CODEX_TOKEN_REFRESH_SKEW_MS = 60000, CODEX_TOKEN_REFRESH_RETRY_COOLDOWN_MS = 60000, CODEX_FALLBACK_NATIVE_DELETE_FAILED_WARNING = "Codex credentials were written to plaintext fallback, but stale native secure storage could not be removed.", CODEX_PLAINTEXT_CLEANUP_FAILED_WARNING = "Codex credentials were saved, but stale plaintext fallback credentials could not be removed.", inFlightCodexRefresh = null, inMemoryLastRefreshFailureAt = null;
 var init_codexCredentials = __esm(() => {
   init_envUtils();
   init_combinedAbortSignal();
   init_secureStorage();
+  init_plainTextStorage();
   init_codexOAuthShared();
 });
 
@@ -19953,6 +20063,7 @@ var init_gitlawb_opengateway = __esm(() => {
     preset: {
       id: "gitlawb-opengateway",
       description: "Gitlawb Opengateway — free hosted Xiaomi MiMo + GMI Cloud partner models (API key required, mint at https://gitlawb.com/opengateway/keys)",
+      apiKeyEnvVars: ["OPENGATEWAY_API_KEY"],
       label: "Gitlawb Opengateway",
       name: "Gitlawb Opengateway",
       vendorId: "openai",
@@ -21845,6 +21956,9 @@ var init_integrationArtifacts_generated = __esm(() => {
       description: "Gitlawb Opengateway — free hosted Xiaomi MiMo + GMI Cloud partner models (API key required, mint at https://gitlawb.com/opengateway/keys)",
       label: "Gitlawb Opengateway",
       name: "Gitlawb Opengateway",
+      apiKeyEnvVars: [
+        "OPENGATEWAY_API_KEY"
+      ],
       baseUrlEnvVars: [
         "OPENGATEWAY_BASE_URL",
         "OPENAI_BASE_URL"
@@ -23279,6 +23393,8 @@ function normalizePathWithV1(pathname) {
   return `${trimmed}/v1`;
 }
 function isLikelyOllamaEndpoint(baseUrl) {
+  if (!baseUrl)
+    return false;
   try {
     const parsed = new URL(baseUrl);
     const hostname = parsed.hostname.toLowerCase();
@@ -41937,7 +42053,7 @@ function getCredentialEnvValidationError(validation, env3, request) {
       return invalidValue.message;
     }
   }
-  if (validation.allowLocalBaseUrlWithoutCredential && request && isLocalProviderUrl(request.baseUrl)) {
+  if (validation.allowLocalBaseUrlWithoutCredential && request && (isLocalProviderUrl(request.baseUrl) || isLikelyOllamaEndpoint(request.baseUrl))) {
     return null;
   }
   if (validation.credentialEnvVars.some((envVar) => hasNonEmptyEnvValue2(env3, envVar))) {
@@ -42065,7 +42181,7 @@ async function getProviderValidationError(env3 = process.env, options) {
         hasStoredXaiOAuthCredentials: options?.hasStoredXaiOAuthCredentials
       });
       if (descriptorValidationError) {
-        if (validationTarget.kind === "vendor" && validationTarget.descriptor.id === "openai" && !env3.OPENAI_API_KEY && !isLocalProviderUrl(request.baseUrl)) {
+        if (validationTarget.kind === "vendor" && validationTarget.descriptor.id === "openai" && !env3.OPENAI_API_KEY && !isLocalProviderUrl(request.baseUrl) && !isLikelyOllamaEndpoint(request.baseUrl)) {
           return getOpenAIMissingKeyMessage();
         }
         return descriptorValidationError;
@@ -42076,7 +42192,7 @@ async function getProviderValidationError(env3 = process.env, options) {
   if (genericRouteValidation.applicable) {
     return genericRouteValidation.error;
   }
-  if (!env3.OPENAI_API_KEY && !isLocalProviderUrl(request.baseUrl)) {
+  if (!env3.OPENAI_API_KEY && !isLocalProviderUrl(request.baseUrl) && !isLikelyOllamaEndpoint(request.baseUrl)) {
     if (validationTarget?.descriptor.setup?.requiresAuth === false) {
       return null;
     }
@@ -93314,7 +93430,7 @@ async function initialize() {
   if (dirs.length === 0)
     return;
   logForDebugging(`Watching for changes in setting files ${[...settingsFiles].join(", ")}...${dropInDir ? ` and drop-in directory ${dropInDir}` : ""}`);
-  watcher = esm_default.watch(dirs, {
+  watcher = dependencies.watch(dirs, {
     persistent: true,
     ignoreInitial: true,
     depth: 0,
@@ -93354,8 +93470,10 @@ function dispose() {
   for (const timer of pendingDeletions.values())
     clearTimeout(timer);
   pendingDeletions.clear();
+  clearSettingsDebounce();
+  settingsSourceGenerations.clear();
   lastMdmSnapshot = null;
-  clearInternalWrites();
+  dependencies.clearInternalWrites();
   settingsChanged.clear();
   const w = watcher;
   watcher = null;
@@ -93368,7 +93486,7 @@ async function getWatchTargets() {
     if (source === "flagSettings") {
       continue;
     }
-    const path10 = getSettingsFilePathForSource(source);
+    const path10 = dependencies.getSettingsFilePathForSource(source);
     if (!path10) {
       continue;
     }
@@ -93378,7 +93496,7 @@ async function getWatchTargets() {
     }
     dirToSettingsFiles.get(dir).add(path10);
     try {
-      const stats = await stat10(path10);
+      const stats = await dependencies.stat(path10);
       if (stats.isFile()) {
         dirsWithExistingFiles.add(dir);
       }
@@ -93394,9 +93512,9 @@ async function getWatchTargets() {
     }
   }
   let dropInDir = null;
-  const managedDropIn = getManagedSettingsDropInDir();
+  const managedDropIn = dependencies.getManagedSettingsDropInDir();
   try {
-    const stats = await stat10(managedDropIn);
+    const stats = await dependencies.stat(managedDropIn);
     if (stats.isDirectory()) {
       dirsWithExistingFiles.add(managedDropIn);
       dropInDir = managedDropIn;
@@ -93418,6 +93536,8 @@ function settingSourceToConfigChangeSource(source) {
   }
 }
 function handleChange(path10) {
+  if (disposed)
+    return;
   const source = getSourceForPath(path10);
   if (!source)
     return;
@@ -93427,19 +93547,24 @@ function handleChange(path10) {
     pendingDeletions.delete(path10);
     logForDebugging(`Cancelled pending deletion of ${path10} — file was recreated`);
   }
-  if (consumeInternalWrite(path10, INTERNAL_WRITE_WINDOW_MS)) {
+  if (dependencies.consumeInternalWrite(path10, INTERNAL_WRITE_WINDOW_MS)) {
     return;
   }
   logForDebugging(`Detected change to ${path10}`);
-  executeConfigChangeHooks(settingSourceToConfigChangeSource(source), path10).then((results) => {
-    if (hasBlockingResult(results)) {
+  const generation = nextSettingsSourceGeneration(source);
+  dependencies.executeConfigChangeHooks(settingSourceToConfigChangeSource(source), path10).then((results) => {
+    if (dependencies.hasBlockingResult(results)) {
       logForDebugging(`ConfigChange hook blocked change to ${path10}`);
       return;
     }
-    fanOut(source);
+    if (disposed)
+      return;
+    scheduleFanOut(source, generation);
   });
 }
 function handleAdd(path10) {
+  if (disposed)
+    return;
   const source = getSourceForPath(path10);
   if (!source)
     return;
@@ -93452,31 +93577,38 @@ function handleAdd(path10) {
   handleChange(path10);
 }
 function handleDelete(path10) {
+  if (disposed)
+    return;
   const source = getSourceForPath(path10);
   if (!source)
     return;
   logForDebugging(`Detected deletion of ${path10}`);
   if (pendingDeletions.has(path10))
     return;
-  const timer = setTimeout((p, src) => {
+  const generation = nextSettingsSourceGeneration(source);
+  const timer = setTimeout((p, src, gen) => {
+    if (disposed)
+      return;
     pendingDeletions.delete(p);
-    executeConfigChangeHooks(settingSourceToConfigChangeSource(src), p).then((results) => {
-      if (hasBlockingResult(results)) {
+    dependencies.executeConfigChangeHooks(settingSourceToConfigChangeSource(src), p).then((results) => {
+      if (dependencies.hasBlockingResult(results)) {
         logForDebugging(`ConfigChange hook blocked deletion of ${p}`);
         return;
       }
-      fanOut(src);
+      if (disposed)
+        return;
+      scheduleFanOut(src, gen);
     });
-  }, testOverrides?.deletionGrace ?? DELETION_GRACE_MS, path10, source);
+  }, testOverrides?.deletionGrace ?? DELETION_GRACE_MS, path10, source, generation);
   pendingDeletions.set(path10, timer);
 }
 function getSourceForPath(path10) {
   const normalizedPath = platformPath.normalize(path10);
-  const dropInDir = getManagedSettingsDropInDir();
+  const dropInDir = platformPath.normalize(dependencies.getManagedSettingsDropInDir());
   if (normalizedPath.startsWith(dropInDir + platformPath.sep)) {
     return "policySettings";
   }
-  return SETTING_SOURCES.find((source) => getSettingsFilePathForSource(source) === normalizedPath);
+  return SETTING_SOURCES.find((source) => platformPath.normalize(dependencies.getSettingsFilePathForSource(source) ?? "") === normalizedPath);
 }
 function startMdmPoll() {
   const initial = getMdmSettings();
@@ -93511,9 +93643,46 @@ function startMdmPoll() {
   mdmPollTimer.unref();
 }
 function fanOut(source) {
-  resetSettingsCache();
+  dependencies.resetSettingsCache();
   settingsChanged.emit(source);
 }
+function clearSettingsDebounce() {
+  if (settingsDebounceTimer) {
+    clearTimeout(settingsDebounceTimer);
+    settingsDebounceTimer = null;
+  }
+  pendingSettingsSources.clear();
+}
+function nextSettingsSourceGeneration(source) {
+  const generation = (settingsSourceGenerations.get(source) ?? 0) + 1;
+  settingsSourceGenerations.set(source, generation);
+  return generation;
+}
+function scheduleFanOut(source, generation) {
+  if (disposed)
+    return;
+  if (settingsSourceGenerations.get(source) !== generation)
+    return;
+  pendingSettingsSources.set(source, generation);
+  if (settingsDebounceTimer) {
+    clearTimeout(settingsDebounceTimer);
+  }
+  settingsDebounceTimer = setTimeout(() => {
+    settingsDebounceTimer = null;
+    if (disposed) {
+      pendingSettingsSources.clear();
+      return;
+    }
+    const sources = [...pendingSettingsSources].flatMap(([src, generation2]) => settingsSourceGenerations.get(src) === generation2 ? [src] : []);
+    pendingSettingsSources.clear();
+    if (sources.length === 0)
+      return;
+    dependencies.resetSettingsCache();
+    for (const src of sources) {
+      settingsChanged.emit(src);
+    }
+  }, testOverrides?.settingsDebounce ?? SETTINGS_DEBOUNCE_MS);
+}
 function notifyChange(source) {
   logForDebugging(`Programmatic settings change notification for ${source}`);
   fanOut(source);
@@ -93526,6 +93695,8 @@ function resetForTesting(overrides) {
   for (const timer of pendingDeletions.values())
     clearTimeout(timer);
   pendingDeletions.clear();
+  clearSettingsDebounce();
+  settingsSourceGenerations.clear();
   lastMdmSnapshot = null;
   initialized = false;
   disposed = false;
@@ -93534,7 +93705,7 @@ function resetForTesting(overrides) {
   watcher = null;
   return w ? w.close() : Promise.resolve();
 }
-var FILE_STABILITY_THRESHOLD_MS = 1000, FILE_STABILITY_POLL_INTERVAL_MS = 500, INTERNAL_WRITE_WINDOW_MS = 5000, MDM_POLL_INTERVAL_MS, DELETION_GRACE_MS, watcher = null, mdmPollTimer = null, lastMdmSnapshot = null, initialized = false, disposed = false, pendingDeletions, settingsChanged, testOverrides = null, subscribe, settingsChangeDetector;
+var FILE_STABILITY_THRESHOLD_MS = 1000, FILE_STABILITY_POLL_INTERVAL_MS = 500, INTERNAL_WRITE_WINDOW_MS = 5000, MDM_POLL_INTERVAL_MS, DELETION_GRACE_MS, SETTINGS_DEBOUNCE_MS = 500, watcher = null, mdmPollTimer = null, lastMdmSnapshot = null, initialized = false, disposed = false, pendingDeletions, settingsDebounceTimer = null, pendingSettingsSources, settingsSourceGenerations, settingsChanged, testOverrides = null, defaultDependencies, dependencies, subscribe, settingsChangeDetector;
 var init_changeDetector = __esm(() => {
   init_esm2();
   init_state();
@@ -93552,7 +93723,21 @@ var init_changeDetector = __esm(() => {
   MDM_POLL_INTERVAL_MS = 30 * 60 * 1000;
   DELETION_GRACE_MS = FILE_STABILITY_THRESHOLD_MS + FILE_STABILITY_POLL_INTERVAL_MS + 200;
   pendingDeletions = new Map;
+  pendingSettingsSources = new Map;
+  settingsSourceGenerations = new Map;
   settingsChanged = createSignal();
+  defaultDependencies = {
+    clearInternalWrites,
+    consumeInternalWrite,
+    executeConfigChangeHooks,
+    getManagedSettingsDropInDir,
+    getSettingsFilePathForSource,
+    hasBlockingResult,
+    resetSettingsCache,
+    stat: stat10,
+    watch: esm_default.watch.bind(esm_default)
+  };
+  dependencies = defaultDependencies;
   subscribe = settingsChanged.subscribe;
   settingsChangeDetector = {
     initialize,
@@ -134956,8 +135141,8 @@ More information can be found at: https://a.co/c895JFp`);
       try {
         const appPackageJsonPath = node_path.join(nodeModulesParentDir, "package.json");
         const packageJson = await promises.readFile(appPackageJsonPath, "utf-8");
-        const { dependencies, devDependencies } = JSON.parse(packageJson);
-        const version2 = devDependencies?.typescript ?? dependencies?.typescript;
+        const { dependencies: dependencies2, devDependencies } = JSON.parse(packageJson);
+        const version2 = devDependencies?.typescript ?? dependencies2?.typescript;
         if (typeof version2 !== "string") {
           continue;
         }
@@ -232303,7 +232488,7 @@ var init_metadata = __esm(() => {
       isClaudeAiAuth: isClaudeAISubscriber(),
       version: "99.0.0",
       versionBase: getVersionBase(),
-      buildTime: "2026-05-26T10:36:27.285Z",
+      buildTime: "2026-05-27T08:20:35.775Z",
       deploymentEnvironment: env2.detectDeploymentEnvironment(),
       ...isEnvTruthy(process.env.GITHUB_ACTIONS) && {
         githubEventName: process.env.GITHUB_EVENT_NAME,
@@ -243316,6 +243501,10 @@ function modelSupportsThinking(model2) {
     if (descriptorSupportsThinking !== undefined) {
       return descriptorSupportsThinking;
     }
+    const routeId = resolveActiveRouteIdFromEnv(process.env);
+    if (routeId === "ollama") {
+      return false;
+    }
   }
   return canonical.includes("sonnet-4") || canonical.includes("opus-4");
 }
@@ -243344,6 +243533,9 @@ function shouldEnableThinkingByDefault() {
   }
   return true;
 }
+function shouldUseThinkingForModel(model2, thinkingConfig) {
+  return thinkingConfig.type !== "disabled" && !isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_THINKING) && modelSupportsThinking(model2);
+}
 var RAINBOW_COLORS, RAINBOW_SHIMMER_COLORS;
 var init_thinking = __esm(() => {
   init_growthbook();
@@ -243353,6 +243545,7 @@ var init_thinking = __esm(() => {
   init_modelSupportOverrides();
   init_providers();
   init_settings2();
+  init_envUtils();
   RAINBOW_COLORS = [
     "rainbow_red",
     "rainbow_orange",
@@ -314881,12 +315074,23 @@ function getAgentModel(agentModel, parentModel, toolSpecifiedModel, permissionMo
     }
     return resolvedModel;
   };
-  if (toolSpecifiedModel) {
-    if (aliasMatchesParentTier(toolSpecifiedModel, parentModel)) {
+  const trimmedToolSpecifiedModel = toolSpecifiedModel?.trim();
+  if (trimmedToolSpecifiedModel) {
+    if (trimmedToolSpecifiedModel.toLowerCase() === "inherit") {
+      return getRuntimeMainLoopModel({
+        permissionMode: permissionMode ?? "default",
+        mainLoopModel: parentModel,
+        exceeds200kTokens: false
+      });
+    }
+    if (aliasMatchesParentTier(trimmedToolSpecifiedModel, parentModel)) {
+      assertToolSpecifiedModelAllowed(trimmedToolSpecifiedModel, parentModel);
       return parentModel;
     }
-    const model3 = parseUserSpecifiedModel(toolSpecifiedModel);
-    return applyParentRegionPrefix(model3, toolSpecifiedModel);
+    const model3 = parseUserSpecifiedModel(trimmedToolSpecifiedModel);
+    const effectiveModel = applyParentRegionPrefix(model3, trimmedToolSpecifiedModel);
+    assertToolSpecifiedModelAllowed(trimmedToolSpecifiedModel, effectiveModel);
+    return effectiveModel;
   }
   const agentModelWithExp = agentModel ?? getDefaultSubagentModel();
   if ((agentModelWithExp === "haiku" || agentModelWithExp === "sonnet") && !checkIsClaudeNativeProvider()) {
@@ -314922,6 +315126,12 @@ function aliasMatchesParentTier(alias, parentModel) {
       return false;
   }
 }
+function assertToolSpecifiedModelAllowed(requestedModel, effectiveModel) {
+  if (isModelAllowed(requestedModel) || effectiveModel !== requestedModel && isModelAllowed(effectiveModel)) {
+    return;
+  }
+  throw new Error(`Model '${requestedModel}' is not available. Your organization restricts model selection.`);
+}
 function checkIsClaudeNativeProvider() {
   const provider = getAPIProvider();
   return provider === "bedrock" || provider === "vertex" || provider === "foundry" || provider === "firstParty" && isFirstPartyAnthropicBaseUrl();
@@ -314962,6 +315172,7 @@ var init_agent = __esm(() => {
   init_stringUtils();
   init_aliases();
   init_bedrock2();
+  init_modelAllowlist();
   init_model();
   init_providers();
   AGENT_MODEL_OPTIONS = [...MODEL_ALIASES, "inherit"];
@@ -366837,6 +367048,9 @@ async function isPossibleClaudeBinary(filePath) {
     if (!stats.isFile() || stats.size === 0) {
       return false;
     }
+    if (env2.platform === "win32") {
+      return true;
+    }
     await access2(filePath, fsConstants2.X_OK);
     return true;
   } catch {
@@ -367044,6 +367258,9 @@ async function performVersionUpdate(version2, forceReinstall) {
   }
   await removeDirectoryIfEmpty(executablePath);
   await updateSymlink(executablePath, installPath);
+  if (!await executableMatchesInstallPath(executablePath, installPath)) {
+    throw new Error(`Failed to update executable at ${executablePath} to installed version ${version2}. ` + `The executable does not match ${installPath}. ` + `Check write permissions to ${executablePath}.`);
+  }
   if (!await isPossibleClaudeBinary(executablePath)) {
     let installPathExists = false;
     try {
@@ -367178,6 +367395,7 @@ async function updateSymlink(symlinkPath, targetPath) {
         await rename2(symlinkPath, oldFileName);
         try {
           await copyFile2(targetPath, symlinkPath);
+          await chmod5(symlinkPath, 493);
           try {
             await unlink7(oldFileName);
           } catch {}
@@ -367194,6 +367412,7 @@ async function updateSymlink(symlinkPath, targetPath) {
       } else {
         try {
           await copyFile2(targetPath, symlinkPath);
+          await chmod5(symlinkPath, 493);
         } catch (e) {
           if (isENOENT(e)) {
             throw new Error(`Source file does not exist: ${targetPath}`);
@@ -367204,7 +367423,7 @@ async function updateSymlink(symlinkPath, targetPath) {
       return true;
     } catch (error42) {
       logError2(new Error(`Failed to copy executable from ${targetPath} to ${symlinkPath}: ${error42}`));
-      return false;
+      throw error42;
     }
   }
   const parentDir = dirname27(symlinkPath);
@@ -367213,7 +367432,7 @@ async function updateSymlink(symlinkPath, targetPath) {
     logForDebugging(`Created directory ${parentDir} for symlink`);
   } catch (mkdirError) {
     logError2(new Error(`Failed to create directory ${parentDir}: ${mkdirError}`));
-    return false;
+    throw mkdirError;
   }
   try {
     let symlinkExists = false;
@@ -367246,9 +367465,38 @@ async function updateSymlink(symlinkPath, targetPath) {
       await unlink7(tempSymlink);
     } catch {}
     logError2(new Error(`Failed to create symlink from ${symlinkPath} to ${targetPath}: ${error42}`));
+    throw error42;
+  }
+}
+async function filesHaveSameContent(leftPath, rightPath) {
+  try {
+    const [leftStats, rightStats] = await Promise.all([
+      stat20(leftPath),
+      stat20(rightPath)
+    ]);
+    if (!leftStats.isFile() || !rightStats.isFile() || leftStats.size !== rightStats.size) {
+      return false;
+    }
+    const [leftContent, rightContent] = await Promise.all([
+      readFile15(leftPath),
+      readFile15(rightPath)
+    ]);
+    return leftContent.equals(rightContent);
+  } catch {
     return false;
   }
 }
+async function executableMatchesInstallPath(executablePath, installPath) {
+  if (getPlatform2().startsWith("win32")) {
+    return filesHaveSameContent(executablePath, installPath);
+  }
+  try {
+    const target = await readlink(executablePath);
+    return resolve20(dirname27(executablePath), target) === resolve20(installPath) && await isPossibleClaudeBinary(installPath);
+  } catch {
+    return filesHaveSameContent(executablePath, installPath);
+  }
+}
 async function checkInstall(force = false) {
   if (isEnvTruthy(process.env.DISABLE_INSTALLATION_CHECKS)) {
     return [];
@@ -370526,6 +370774,7 @@ function useCodexOAuthFlow(options2) {
         if (!saved.success) {
           throw new Error(saved.warning ?? "Codex OAuth succeeded, but credentials could not be saved securely.");
         }
+        return { warning: saved.warning };
       };
       await onAuthenticated(tokens, persistCredentials);
     }).catch((error42) => {
@@ -371341,12 +371590,16 @@ function ProviderManager({ mode, onDone }) {
   function clearStartupProviderOverrideFromUserSettings() {
     return clearStartupProviderOverrides();
   }
+  function formatWarningsForMessage(warnings) {
+    const joined = warnings.join("; ");
+    return /[.!?]$/.test(joined.trim()) ? joined : `${joined}.`;
+  }
   function buildCodexOAuthActivationMessage(options2) {
     if (options2.activationWarning) {
-      return `${options2.prefix}. Saved for next startup. Warning: ${options2.warnings.join("; ")}.`;
+      return `${options2.prefix}. Saved for next startup. Warning: ${formatWarningsForMessage(options2.warnings)}`;
     }
     if (options2.warnings.length > 0) {
-      return `${options2.prefix}. OpenClaude switched to it for this session with warnings: ${options2.warnings.join("; ")}.`;
+      return `${options2.prefix}. OpenClaude switched to it for this session with warnings: ${formatWarningsForMessage(options2.warnings)}`;
     }
     return `${options2.prefix}. OpenClaude switched to it for this session.`;
   }
@@ -372565,13 +372818,17 @@ function ProviderManager({ mode, onDone }) {
             returnToMenu();
             return;
           }
-          persistCredentials({ profileId: saved.id });
+          const persistenceResult = persistCredentials({
+            profileId: saved.id
+          });
+          const storageWarning = persistenceResult && typeof persistenceResult === "object" ? persistenceResult.warning : null;
           const settingsOverrideError = clearStartupProviderOverrideFromUserSettings();
           const activationWarning = await activateCodexOAuthSession(tokens);
           setHasStoredCodexOAuthCredentials(true);
           setStoredCodexOAuthProfileId(saved.id);
           refreshProfiles();
           const warnings = [
+            storageWarning,
             activationWarning,
             settingsOverrideError ? `could not clear startup provider override (${settingsOverrideError})` : null
           ].filter((warning) => Boolean(warning));
@@ -406308,6 +406565,7 @@ function getDisableExtglobCommand(shellPath) {
 }
 async function createBashShellProvider(shellPath, options2) {
   let currentSandboxTmpDir;
+  const skipSnapshot = options2?.skipSnapshot === true;
   const snapshotPromise = options2?.skipSnapshot ? Promise.resolve(undefined) : createAndSaveSnapshot(shellPath).catch((error42) => {
     logForDebugging(`Failed to create shell snapshot: ${error42}`);
     return;
@@ -406363,7 +406621,7 @@ async function createBashShellProvider(shellPath, options2) {
       return { commandString, cwdFilePath };
     },
     getSpawnArgs(commandString) {
-      const skipLoginShell = lastSnapshotFilePath !== undefined;
+      const skipLoginShell = skipSnapshot || lastSnapshotFilePath !== undefined;
       if (skipLoginShell) {
         logForDebugging("Spawning shell without login (-l flag skipped)");
       }
@@ -406548,6 +406806,9 @@ async function findSuitableShell() {
       logForDebugging(`CLAUDE_CODE_SHELL="${shellOverride}" is not a valid bash/zsh path, falling back to detection`);
     }
   }
+  if (getPlatform() === "windows") {
+    return findGitBashPath();
+  }
   const env_shell = process.env.SHELL;
   const isEnvShellSupported = env_shell && (env_shell.includes("bash") || env_shell.includes("zsh"));
   const preferBash = env_shell?.includes("bash");
@@ -406579,7 +406840,9 @@ async function findSuitableShell() {
 }
 async function getShellConfigImpl() {
   const binShell = await findSuitableShell();
-  const provider = await createBashShellProvider(binShell);
+  const provider = await createBashShellProvider(binShell, {
+    skipSnapshot: false
+  });
   return { provider };
 }
 async function exec3(command, abortSignal, shellType, options2) {
@@ -460387,7 +460650,7 @@ var init_AgentTool = __esm(() => {
     description: exports_external.string().describe("A short (3-5 word) description of the task"),
     prompt: exports_external.string().describe("The task for the agent to perform"),
     subagent_type: exports_external.string().optional().describe("The type of specialized agent to use for this task"),
-    model: exports_external.enum(["sonnet", "opus", "haiku"]).optional().describe("Optional model override for this agent. Takes precedence over the agent definition's model frontmatter. If omitted, uses the agent definition's model, or inherits from the parent."),
+    model: exports_external.string().trim().min(1, "Model cannot be empty").optional().describe("Optional model override for this agent. Accepts aliases such as sonnet, opus, haiku, inherit, or a provider-supported model ID. Takes precedence over the agent definition's model frontmatter. If omitted, uses the agent definition's model, or inherits from the parent."),
     run_in_background: exports_external.boolean().optional().describe("Set to true to run this agent in the background. You will be notified when it completes.")
   }));
   fullInputSchema2 = lazySchema(() => {
@@ -460494,6 +460757,8 @@ var init_AgentTool = __esm(() => {
         if (agentDef?.color) {
           setAgentColor(subagent_type, agentDef.color);
         }
+        const rawTeammateModel = model2 ?? agentDef?.model;
+        const resolvedTeammateModel = rawTeammateModel === undefined ? undefined : getAgentModel(agentDef?.model, toolUseContext.options.mainLoopModel, model2, permissionMode);
         const result = await spawnTeammate({
           name,
           prompt,
@@ -460501,7 +460766,7 @@ var init_AgentTool = __esm(() => {
           team_name: teamName,
           use_splitpane: true,
           plan_mode_required: spawnMode === "plan",
-          model: model2 ?? agentDef?.model,
+          model: resolvedTeammateModel,
           agent_type: subagent_type,
           invokingRequestId: assistantMessage2?.requestId
         }, toolUseContext);
@@ -464145,6 +464410,16 @@ function getAttributionTexts() {
     }
     return { commit: "", pr: "" };
   }
+  const settings = getInitialSettings();
+  if (settings.attribution) {
+    return {
+      commit: settings.attribution.commit ?? "",
+      pr: settings.attribution.pr ?? ""
+    };
+  }
+  if (settings.includeCoAuthoredBy !== true) {
+    return { commit: "", pr: "" };
+  }
   const model2 = getMainLoopModel();
   const apiProvider = getAPIProvider();
   const modelName = getDefaultCommitCoAuthorName({
@@ -464152,20 +464427,9 @@ function getAttributionTexts() {
     apiProvider,
     isInternalRepo: isInternalModelRepoCached()
   });
-  const defaultAttribution = "\uD83E\uDD16 Generated with [OpenClaude](https://github.com/AndersonBY/openclaude)";
   const coAuthorEmail = getDefaultCommitCoAuthorEmail(apiProvider);
   const defaultCommit = isEnvTruthy(process.env.OPENCLAUDE_DISABLE_CO_AUTHORED_BY) ? "" : `Co-Authored-By: ${modelName} <${coAuthorEmail}>`;
-  const settings = getInitialSettings();
-  if (settings.attribution) {
-    return {
-      commit: settings.attribution.commit ?? defaultCommit,
-      pr: settings.attribution.pr ?? defaultAttribution
-    };
-  }
-  if (settings.includeCoAuthoredBy === false) {
-    return { commit: "", pr: "" };
-  }
-  return { commit: defaultCommit, pr: defaultAttribution };
+  return { commit: defaultCommit, pr: DEFAULT_PR_ATTRIBUTION };
 }
 function isTerminalOutput(content) {
   for (const tag2 of TERMINAL_OUTPUT_TAGS) {
@@ -464276,13 +464540,15 @@ async function getEnhancedPRAttribution(getAppState) {
     return "";
   }
   const settings = getInitialSettings();
-  if (settings.attribution?.pr) {
+  if (settings.attribution?.pr !== undefined) {
     return settings.attribution.pr;
   }
-  if (settings.includeCoAuthoredBy === false) {
+  if (settings.attribution) {
+    return "";
+  }
+  if (settings.includeCoAuthoredBy !== true) {
     return "";
   }
-  const defaultAttribution = "\uD83E\uDD16 Generated with [OpenClaude](https://github.com/AndersonBY/openclaude)";
   const appState = getAppState();
   logForDebugging(`PR Attribution: appState.attribution exists: ${!!appState.attribution}`);
   if (appState.attribution) {
@@ -464302,7 +464568,7 @@ async function getEnhancedPRAttribution(getAppState) {
   const shortModelName = isInternal ? rawModelName : sanitizeModelName(rawModelName);
   if (claudePercent === 0 && promptCount === 0 && memoryAccessCount === 0) {
     logForDebugging("PR Attribution: returning default (no data)");
-    return defaultAttribution;
+    return DEFAULT_PR_ATTRIBUTION;
   }
   const memSuffix = memoryAccessCount > 0 ? `, ${memoryAccessCount} ${memoryAccessCount === 1 ? "memory" : "memories"} recalled` : "";
   const summary = `\uD83E\uDD16 Generated with [OpenClaude](https://github.com/AndersonBY/openclaude) (${claudePercent}% ${promptCount}-shotted by ${shortModelName}${memSuffix})`;
@@ -464310,7 +464576,7 @@ async function getEnhancedPRAttribution(getAppState) {
   logForDebugging(`PR Attribution: returning summary: ${summary}`);
   return summary;
 }
-var MEMORY_ACCESS_TOOL_NAMES;
+var DEFAULT_PR_ATTRIBUTION = "\uD83E\uDD16 Generated with [OpenClaude](https://github.com/AndersonBY/openclaude)", MEMORY_ACCESS_TOOL_NAMES;
 var init_attribution = __esm(() => {
   init_state();
   init_envUtils();
@@ -471799,7 +472065,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-05-26T10:36:27.285Z").getTime();
+  const buildTime = new Date("2026-05-27T08:20:35.775Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -498284,7 +498550,7 @@ ${USAGE}` };
         return { type: "text", value: error42 };
       return {
         type: "text",
-        value: "Commit attribution reset to the OpenClaude default."
+        value: "Commit attribution reset to the privacy-preserving default."
       };
     }
     case "set-attribution":
@@ -499938,7 +500204,7 @@ function buildPrimarySection() {
   }, undefined, false, undefined, this);
   return [{
     label: "Version",
-    value: "0.14.9"
+    value: "0.15.1"
   }, {
     label: "Session name",
     value: nameValue
@@ -514833,7 +515099,7 @@ function getReleaseTagUrl(version2 = publicBuildVersion) {
   return `${OPENCLAUDE_RELEASES_URL}/tag/v${normalizePublicVersion(version2)}`;
 }
 function getPublicBuildVersion() {
-  return "0.14.9";
+  return "0.15.1";
 }
 var import_semver9, OPENCLAUDE_RELEASES_URL = "https://github.com/AndersonBY/openclaude/releases", fallbackBuildVersion, publicBuildVersion;
 var init_version = __esm(() => {
@@ -538928,15 +539194,15 @@ var require_filter_parse = __commonJS((exports, module) => {
     }
     return byteWidth;
   }
-  var Filter = module.exports = function(bitmapInfo, dependencies) {
+  var Filter = module.exports = function(bitmapInfo, dependencies2) {
     let width = bitmapInfo.width;
     let height = bitmapInfo.height;
     let interlace = bitmapInfo.interlace;
     let bpp = bitmapInfo.bpp;
     let depth = bitmapInfo.depth;
-    this.read = dependencies.read;
-    this.write = dependencies.write;
-    this.complete = dependencies.complete;
+    this.read = dependencies2.read;
+    this.write = dependencies2.write;
+    this.complete = dependencies2.complete;
     this._imageIndex = 0;
     this._images = [];
     if (interlace) {
@@ -539143,7 +539409,7 @@ var require_crc = __commonJS((exports, module) => {
 var require_parser5 = __commonJS((exports, module) => {
   var constants5 = require_constants11();
   var CrcCalculator = require_crc();
-  var Parser2 = module.exports = function(options2, dependencies) {
+  var Parser2 = module.exports = function(options2, dependencies2) {
     this._options = options2;
     options2.checkCRC = options2.checkCRC !== false;
     this._hasIHDR = false;
@@ -539158,17 +539424,17 @@ var require_parser5 = __commonJS((exports, module) => {
     this._chunks[constants5.TYPE_PLTE] = this._handlePLTE.bind(this);
     this._chunks[constants5.TYPE_tRNS] = this._handleTRNS.bind(this);
     this._chunks[constants5.TYPE_gAMA] = this._handleGAMA.bind(this);
-    this.read = dependencies.read;
-    this.error = dependencies.error;
-    this.metadata = dependencies.metadata;
-    this.gamma = dependencies.gamma;
-    this.transColor = dependencies.transColor;
-    this.palette = dependencies.palette;
-    this.parsed = dependencies.parsed;
-    this.inflateData = dependencies.inflateData;
-    this.finished = dependencies.finished;
-    this.simpleTransparency = dependencies.simpleTransparency;
-    this.headersFinished = dependencies.headersFinished || function() {};
+    this.read = dependencies2.read;
+    this.error = dependencies2.error;
+    this.metadata = dependencies2.metadata;
+    this.gamma = dependencies2.gamma;
+    this.transColor = dependencies2.transColor;
+    this.palette = dependencies2.palette;
+    this.parsed = dependencies2.parsed;
+    this.inflateData = dependencies2.inflateData;
+    this.finished = dependencies2.finished;
+    this.simpleTransparency = dependencies2.simpleTransparency;
+    this.headersFinished = dependencies2.headersFinished || function() {};
   };
   Parser2.prototype.start = function() {
     this.read(constants5.PNG_SIGNATURE.length, this._parseSignature.bind(this));
@@ -566759,7 +567025,8 @@ function AgentsList(t0) {
     onBack,
     onSelect,
     onCreateNew,
-    changes
+    changes,
+    activeAgentName
   } = t0;
   const [selectedAgent, setSelectedAgent] = React105.useState(null);
   const [isCreateNewSelected, setIsCreateNewSelected] = React105.useState(true);
@@ -566793,81 +567060,83 @@ function AgentsList(t0) {
     t2 = $2[3];
   }
   const renderCreateNewOption = t2;
-  let t3;
-  if ($2[4] !== isCreateNewSelected || $2[5] !== selectedAgent?.agentType || $2[6] !== selectedAgent?.source) {
-    t3 = (agent_0) => {
-      const isBuiltIn = agent_0.source === "built-in";
-      const isSelected = !isBuiltIn && !isCreateNewSelected && selectedAgent?.agentType === agent_0.agentType && selectedAgent?.source === agent_0.source;
-      const {
-        isOverridden,
-        overriddenBy
-      } = getOverrideInfo(agent_0);
-      const dimmed = isBuiltIn || isOverridden;
-      const textColor = !isBuiltIn && isSelected ? "suggestion" : undefined;
-      const resolvedModel = resolveAgentModelDisplay(agent_0);
-      return /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedBox_default, {
-        children: [
-          /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
-            dimColor: dimmed && !isSelected,
-            color: textColor,
-            children: isBuiltIn ? "" : isSelected ? `${figures_default.pointer} ` : "  "
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
-            dimColor: dimmed && !isSelected,
-            color: textColor,
-            children: agent_0.agentType
-          }, undefined, false, undefined, this),
-          resolvedModel && /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
-            dimColor: true,
-            color: textColor,
-            children: [
-              " · ",
-              resolvedModel
-            ]
-          }, undefined, true, undefined, this),
-          agent_0.memory && /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
-            dimColor: true,
-            color: textColor,
-            children: [
-              " · ",
-              agent_0.memory,
-              " memory"
-            ]
-          }, undefined, true, undefined, this),
-          overriddenBy && /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
-            dimColor: !isSelected,
-            color: isSelected ? "warning" : undefined,
-            children: [
-              " ",
-              figures_default.warning,
-              " shadowed by ",
-              getOverrideSourceLabel(overriddenBy)
-            ]
-          }, undefined, true, undefined, this)
-        ]
-      }, `${agent_0.agentType}-${agent_0.source}`, true, undefined, this);
-    };
-    $2[4] = isCreateNewSelected;
-    $2[5] = selectedAgent?.agentType;
-    $2[6] = selectedAgent?.source;
-    $2[7] = t3;
-  } else {
-    t3 = $2[7];
-  }
-  const renderAgent = t3;
+  const renderAgent = (agent_0) => {
+    const isSelected = !isCreateNewSelected && selectedAgent?.agentType === agent_0.agentType && selectedAgent?.source === agent_0.source;
+    const isActive = agent_0.agentType === activeAgentName && !agent_0.overriddenBy;
+    const {
+      isOverridden,
+      overriddenBy
+    } = getOverrideInfo(agent_0);
+    const dimmed = agent_0.source === "built-in" || isOverridden;
+    const textColor = isSelected ? "suggestion" : undefined;
+    const resolvedModel = resolveAgentModelDisplay(agent_0);
+    return /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedBox_default, {
+      children: [
+        /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+          dimColor: dimmed && !isSelected,
+          color: textColor,
+          children: isSelected ? `${figures_default.pointer} ` : "  "
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+          dimColor: dimmed && !isSelected,
+          color: textColor,
+          children: agent_0.agentType
+        }, undefined, false, undefined, this),
+        resolvedModel && /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+          dimColor: true,
+          color: textColor,
+          children: [
+            " · ",
+            resolvedModel
+          ]
+        }, undefined, true, undefined, this),
+        agent_0.memory && /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+          dimColor: true,
+          color: textColor,
+          children: [
+            " · ",
+            agent_0.memory,
+            " memory"
+          ]
+        }, undefined, true, undefined, this),
+        isActive && /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+          color: "success",
+          children: [
+            " ",
+            figures_default.tick,
+            " active"
+          ]
+        }, undefined, true, undefined, this),
+        overriddenBy && /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+          dimColor: !isSelected,
+          color: isSelected ? "warning" : undefined,
+          children: [
+            " ",
+            figures_default.warning,
+            " shadowed by ",
+            getOverrideSourceLabel(overriddenBy)
+          ]
+        }, undefined, true, undefined, this)
+      ]
+    }, `${agent_0.agentType}-${agent_0.source}`, true, undefined, this);
+  };
   let t4;
   if ($2[8] !== sortedAgents || $2[9] !== source) {
     bb0: {
       const nonBuiltIn = sortedAgents.filter(_temp263);
       if (source === "all") {
-        t4 = AGENT_SOURCE_GROUPS.filter(_temp339).flatMap((t52) => {
+        t4 = AGENT_SOURCE_GROUPS.flatMap((t52) => {
           const {
             source: groupSource
           } = t52;
-          return nonBuiltIn.filter((a_0) => a_0.source === groupSource);
+          return sortedAgents.filter((a_0) => a_0.source === groupSource);
         });
         break bb0;
       }
+      if (source === "built-in") {
+        t4 = sortedAgents;
+        break bb0;
+      }
       t4 = nonBuiltIn;
     }
     $2[8] = sortedAgents;
@@ -567102,29 +567371,30 @@ function AgentsList(t0) {
         } else {
           t27 = $2[64];
         }
-        let t28;
-        if ($2[65] !== handleKeyDown || $2[66] !== t233 || $2[67] !== t27) {
-          t28 = /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedBox_default, {
-            flexDirection: "column",
-            gap: 1,
-            tabIndex: 0,
-            autoFocus: true,
-            onKeyDown: handleKeyDown,
-            children: [
-              t233,
-              t242,
-              t25,
-              t26,
-              t27
-            ]
-          }, undefined, true, undefined, this);
-          $2[65] = handleKeyDown;
-          $2[66] = t233;
-          $2[67] = t27;
-          $2[68] = t28;
-        } else {
-          t28 = $2[68];
-        }
+        const t28 = /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedBox_default, {
+          flexDirection: "column",
+          gap: 1,
+          tabIndex: 0,
+          autoFocus: true,
+          onKeyDown: handleKeyDown,
+          children: [
+            /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+              dimColor: true,
+              children: [
+                "Current session agent: ",
+                /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+                  bold: true,
+                  children: activeAgentName ?? "none"
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this),
+            t233,
+            t242,
+            t25,
+            t26,
+            t27
+          ]
+        }, undefined, true, undefined, this);
         let t29;
         if ($2[69] !== onBack || $2[70] !== sourceTitle || $2[71] !== t28) {
           t29 = /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(Dialog, {
@@ -567157,19 +567427,27 @@ function AgentsList(t0) {
       t18 = `${t232} agents`;
       t19 = onBack;
       t20 = true;
-      if ($2[75] !== changes) {
-        t21 = changes && changes.length > 0 && /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedBox_default, {
-          marginTop: 1,
-          children: /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+      t21 = /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(jsx_dev_runtime318.Fragment, {
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
             dimColor: true,
-            children: changes[changes.length - 1]
+            children: [
+              "Current session agent: ",
+              /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+                bold: true,
+                children: activeAgentName ?? "none"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          changes && changes.length > 0 && /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedBox_default, {
+            marginTop: 1,
+            children: /* @__PURE__ */ jsx_dev_runtime318.jsxDEV(ThemedText, {
+              dimColor: true,
+              children: changes[changes.length - 1]
+            }, undefined, false, undefined, this)
           }, undefined, false, undefined, this)
-        }, undefined, false, undefined, this);
-        $2[75] = changes;
-        $2[76] = t21;
-      } else {
-        t21 = $2[76];
-      }
+        ]
+      }, undefined, true, undefined, this);
       T0 = ThemedBox_default;
       t11 = "column";
       t12 = 0;
@@ -567357,9 +567635,6 @@ function _temp522(a_3) {
 function _temp430(a_2) {
   return a_2.source === "built-in";
 }
-function _temp339(g) {
-  return g.source !== "built-in";
-}
 function _temp263(a2) {
   return a2.source !== "built-in";
 }
@@ -567467,7 +567742,7 @@ function WizardProvider(t0) {
         }
       } else {
         if (currentStepIndex > 0) {
-          setCurrentStepIndex(_temp340);
+          setCurrentStepIndex(_temp339);
         } else {
           if (onCancel) {
             onCancel();
@@ -567581,7 +567856,7 @@ function WizardProvider(t0) {
   }
   return t14;
 }
-function _temp340(prev_2) {
+function _temp339(prev_2) {
   return prev_2 - 1;
 }
 function _temp264(prev_1) {
@@ -568257,7 +568532,7 @@ function ConfirmStep(t0) {
           color: "error",
           children: "Errors:"
         }, undefined, false, undefined, this),
-        validation.errors.map(_temp341)
+        validation.errors.map(_temp340)
       ]
     }, undefined, true, undefined, this);
     $2[4] = agent2;
@@ -568425,7 +568700,7 @@ function ConfirmStep(t0) {
   }
   return t25;
 }
-function _temp341(err2, i_0) {
+function _temp340(err2, i_0) {
   return /* @__PURE__ */ jsx_dev_runtime323.jsxDEV(ThemedText, {
     color: "error",
     children: [
@@ -570057,11 +570332,13 @@ function AgentsMenu(t0) {
   const $2 = import_react_compiler_runtime252.c(157);
   const {
     tools,
-    onExit: onExit2
+    onExit: onExit2,
+    onSetActiveAgent,
+    initialModeState
   } = t0;
   let t1;
   if ($2[0] === Symbol.for("react.memo_cache_sentinel")) {
-    t1 = {
+    t1 = initialModeState ?? {
       mode: "list-agents",
       source: "all"
     };
@@ -570072,7 +570349,8 @@ function AgentsMenu(t0) {
   const [modeState, setModeState] = import_react182.useState(t1);
   const agentDefinitions = useAppState(_temp147);
   const mcpTools = useAppState(_temp266);
-  const toolPermissionContext = useAppState(_temp342);
+  const toolPermissionContext = useAppState(_temp341);
+  const activeAgentName = useAppState((s) => s.agent);
   const setAppState = useSetAppState();
   const {
     allAgents,
@@ -570275,25 +570553,15 @@ ${changes.join(`
       } else {
         t17 = $2[39];
       }
-      let t18;
-      if ($2[40] !== changes || $2[41] !== modeState.source || $2[42] !== resolvedAgents || $2[43] !== t15 || $2[44] !== t16) {
-        t18 = /* @__PURE__ */ jsx_dev_runtime335.jsxDEV(AgentsList, {
-          source: modeState.source,
-          agents: resolvedAgents,
-          onBack: t15,
-          onSelect: t16,
-          onCreateNew: t17,
-          changes
-        }, undefined, false, undefined, this);
-        $2[40] = changes;
-        $2[41] = modeState.source;
-        $2[42] = resolvedAgents;
-        $2[43] = t15;
-        $2[44] = t16;
-        $2[45] = t18;
-      } else {
-        t18 = $2[45];
-      }
+      const t18 = /* @__PURE__ */ jsx_dev_runtime335.jsxDEV(AgentsList, {
+        source: modeState.source,
+        agents: resolvedAgents,
+        onBack: t15,
+        onSelect: t16,
+        onCreateNew: t17,
+        changes,
+        activeAgentName
+      }, undefined, false, undefined, this);
       let t19;
       if ($2[46] === Symbol.for("react.memo_cache_sentinel")) {
         t19 = /* @__PURE__ */ jsx_dev_runtime335.jsxDEV(AgentNavigationFooter, {}, undefined, false, undefined, this);
@@ -570346,16 +570614,16 @@ ${changes.join(`
     case "agent-menu": {
       let t13;
       if ($2[53] !== allAgents || $2[54] !== modeState.agent.agentType || $2[55] !== modeState.agent.source) {
-        let t142;
+        let t14;
         if ($2[57] !== modeState.agent.agentType || $2[58] !== modeState.agent.source) {
-          t142 = (a_9) => a_9.agentType === modeState.agent.agentType && a_9.source === modeState.agent.source;
+          t14 = (a_9) => a_9.agentType === modeState.agent.agentType && a_9.source === modeState.agent.source;
           $2[57] = modeState.agent.agentType;
           $2[58] = modeState.agent.source;
-          $2[59] = t142;
+          $2[59] = t14;
         } else {
-          t142 = $2[59];
+          t14 = $2[59];
         }
-        t13 = allAgents.find(t142);
+        t13 = allAgents.find(t14);
         $2[53] = allAgents;
         $2[54] = modeState.agent.agentType;
         $2[55] = modeState.agent.source;
@@ -570366,90 +570634,71 @@ ${changes.join(`
       const freshAgent_1 = t13;
       const agentToUse = freshAgent_1 || modeState.agent;
       const isEditable = agentToUse.source !== "built-in" && agentToUse.source !== "plugin" && agentToUse.source !== "flagSettings";
-      let t14;
-      if ($2[60] === Symbol.for("react.memo_cache_sentinel")) {
-        t14 = {
-          label: "View agent",
-          value: "view"
-        };
-        $2[60] = t14;
-      } else {
-        t14 = $2[60];
-      }
-      let t15;
-      if ($2[61] !== isEditable) {
-        t15 = isEditable ? [{
-          label: "Edit agent",
-          value: "edit"
-        }, {
-          label: "Delete agent",
-          value: "delete"
-        }] : [];
-        $2[61] = isEditable;
-        $2[62] = t15;
-      } else {
-        t15 = $2[62];
-      }
-      let t16;
-      if ($2[63] === Symbol.for("react.memo_cache_sentinel")) {
-        t16 = {
-          label: "Back",
-          value: "back"
-        };
-        $2[63] = t16;
-      } else {
-        t16 = $2[63];
-      }
-      let t17;
-      if ($2[64] !== t15) {
-        t17 = [t14, ...t15, t16];
-        $2[64] = t15;
-        $2[65] = t17;
-      } else {
-        t17 = $2[65];
-      }
-      const menuItems = t17;
-      let t18;
-      if ($2[66] !== agentToUse || $2[67] !== modeState) {
-        t18 = (value_0) => {
-          bb129:
-            switch (value_0) {
-              case "view": {
-                setModeState({
-                  mode: "view-agent",
-                  agent: agentToUse,
-                  previousMode: modeState.previousMode
-                });
-                break bb129;
-              }
-              case "edit": {
-                setModeState({
-                  mode: "edit-agent",
-                  agent: agentToUse,
-                  previousMode: modeState
-                });
-                break bb129;
-              }
-              case "delete": {
-                setModeState({
-                  mode: "delete-confirm",
-                  agent: agentToUse,
-                  previousMode: modeState
-                });
-                break bb129;
-              }
-              case "back": {
-                setModeState(modeState.previousMode);
-              }
+      const isActiveAgent = agentToUse.agentType === activeAgentName;
+      const sessionAgentToUse = agents.find((a_10) => a_10.agentType === agentToUse.agentType) ?? agentToUse;
+      const editableItems = isEditable ? [{
+        label: "Edit agent",
+        value: "edit"
+      }, {
+        label: "Delete agent",
+        value: "delete"
+      }] : [];
+      const activeAgentItems = isActiveAgent ? [{
+        label: "Active agent",
+        value: "active-agent",
+        disabled: true
+      }] : onSetActiveAgent ? [{
+        label: "Set as active agent",
+        value: "set-active"
+      }] : [];
+      const menuItems = [{
+        label: "View agent",
+        value: "view"
+      }, ...activeAgentItems, ...editableItems, {
+        label: "Back",
+        value: "back"
+      }];
+      const handleMenuSelect = (value_0) => {
+        bb129:
+          switch (value_0) {
+            case "view": {
+              setModeState({
+                mode: "view-agent",
+                agent: agentToUse,
+                previousMode: modeState.previousMode
+              });
+              break bb129;
+            }
+            case "set-active": {
+              onSetActiveAgent?.(sessionAgentToUse);
+              setChanges((prev) => [...prev, `Active session agent set to: ${source_default.bold(sessionAgentToUse.agentType)}`]);
+              setModeState({
+                mode: "list-agents",
+                source: "all"
+              });
+              break bb129;
             }
-        };
-        $2[66] = agentToUse;
-        $2[67] = modeState;
-        $2[68] = t18;
-      } else {
-        t18 = $2[68];
-      }
-      const handleMenuSelect = t18;
+            case "edit": {
+              setModeState({
+                mode: "edit-agent",
+                agent: agentToUse,
+                previousMode: modeState
+              });
+              break bb129;
+            }
+            case "delete": {
+              setModeState({
+                mode: "delete-confirm",
+                agent: agentToUse,
+                previousMode: modeState
+              });
+              break bb129;
+            }
+            case "back": {
+              setModeState(modeState.previousMode);
+            }
+          }
+      };
       let t19;
       if ($2[69] !== modeState.previousMode) {
         t19 = () => setModeState(modeState.previousMode);
@@ -570921,7 +571170,7 @@ function _temp523(a_0) {
 function _temp431(a2) {
   return a2.source === "built-in";
 }
-function _temp342(s_1) {
+function _temp341(s_1) {
   return s_1.toolPermissionContext;
 }
 function _temp266(s_0) {
@@ -570965,7 +571214,8 @@ async function call60(onDone, context2) {
   const tools = getTools(permissionContext);
   return /* @__PURE__ */ jsx_dev_runtime336.jsxDEV(AgentsMenu, {
     tools,
-    onExit: onDone
+    onExit: onDone,
+    onSetActiveAgent: context2.setActiveSessionAgent
   }, undefined, false, undefined, this);
 }
 var jsx_dev_runtime336;
@@ -571846,7 +572096,7 @@ var init_bridge_kick = __esm(() => {
 var call66 = async () => {
   return {
     type: "text",
-    value: `${"99.0.0"} (built ${"2026-05-26T10:36:27.285Z"})`
+    value: `${"99.0.0"} (built ${"2026-05-27T08:20:35.775Z"})`
   };
 }, version2, version_default;
 var init_version2 = __esm(() => {
@@ -572608,7 +572858,7 @@ function SandboxDependenciesTab(t0) {
   const bwrapMissing = t3;
   let t4;
   if ($2[5] !== depCheck.errors) {
-    t4 = depCheck.errors.some(_temp343);
+    t4 = depCheck.errors.some(_temp342);
     $2[5] = depCheck.errors;
     $2[6] = t4;
   } else {
@@ -572826,7 +573076,7 @@ function _temp524(err2) {
 function _temp432(e_2) {
   return !e_2.includes("ripgrep") && !e_2.includes("bwrap") && !e_2.includes("socat");
 }
-function _temp343(e_1) {
+function _temp342(e_1) {
   return e_1.includes("socat");
 }
 function _temp267(e_0) {
@@ -573941,7 +574191,7 @@ function ClaudeInChromeMenu(t0) {
       bb22:
         switch (action2) {
           case "install-extension": {
-            setSelectKey(_temp344);
+            setSelectKey(_temp343);
             setShowInstallHint(true);
             openUrl(CHROME_EXTENSION_URL);
             break bb22;
@@ -574245,7 +574495,7 @@ function _temp525(k) {
 function _temp433(k_0) {
   return k_0 + 1;
 }
-function _temp344(k_1) {
+function _temp343(k_1) {
   return k_1 + 1;
 }
 function _temp268(c6) {
@@ -575471,6 +575721,7 @@ async function streamRenderedMessages(messages, tools, sink, {
         screen: "prompt",
         streamingToolUses: [],
         showAllInTranscript: true,
+        hideLogo: true,
         isLoading: false,
         renderRange: range
       }, undefined, false, undefined, this)
@@ -576361,6 +576612,7 @@ var init_openaiModelDiscovery = __esm(() => {
 var exports_model2 = {};
 __export(exports_model2, {
   shouldAutoRefreshRouteCatalog: () => shouldAutoRefreshRouteCatalog,
+  mergeActiveProfileModelOptions: () => mergeActiveProfileModelOptions,
   call: () => call74
 });
 function renderModelLabel(model2) {
@@ -576376,6 +576628,37 @@ function haveSameModelOptions(left, right) {
     return other2 !== undefined && option.value === other2.value && option.label === other2.label && option.description === other2.description && option.descriptionForModel === other2.descriptionForModel;
   });
 }
+function mergeActiveProfileModelOptions(routeId, routeOptions) {
+  const activeProfile = getActiveProviderProfile();
+  if (!activeProfile) {
+    return routeOptions;
+  }
+  const profileEnvApplied = process.env.CLAUDE_CODE_PROVIDER_PROFILE_ENV_APPLIED === "1" && process.env.CLAUDE_CODE_PROVIDER_PROFILE_ENV_APPLIED_ID === activeProfile.id;
+  const activeProfileRouteId = resolveRouteIdFromBaseUrl(activeProfile.baseUrl) ?? resolveProfileRoute(activeProfile.provider).routeId;
+  if (!profileEnvApplied || activeProfileRouteId !== routeId) {
+    return routeOptions;
+  }
+  const profileOptions = getProfileModelOptions(activeProfile);
+  if (profileOptions.length === 0) {
+    return routeOptions;
+  }
+  const routeOptionsByValue = new Map(routeOptions.flatMap((option) => {
+    const value = typeof option.value === "string" ? option.value.trim().toLowerCase() : "";
+    return value ? [[value, option]] : [];
+  }));
+  const merged = [];
+  const seen = new Set;
+  for (const option of profileOptions) {
+    const value = typeof option.value === "string" ? option.value.trim() : "";
+    const key = value.toLowerCase();
+    if (!value || seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    merged.push(routeOptionsByValue.get(key) ?? option);
+  }
+  return merged;
+}
 function getActiveRouteId() {
   const activeProfile = getActiveProviderProfile();
   return resolveActiveRouteIdFromEnv(process.env, {
@@ -576429,11 +576712,12 @@ async function loadDescriptorDiscoveryContext(routeId) {
     if (staticEntries.length === 0) {
       return null;
     }
+    const routeOptions2 = buildRouteCatalogModelOptions(routeLabel, staticEntries, routeDefaultModel);
     return {
       kind: "descriptor",
       autoRefresh: false,
       canRefresh,
-      optionsOverride: buildRouteCatalogModelOptions(routeLabel, staticEntries, routeDefaultModel),
+      optionsOverride: mergeActiveProfileModelOptions(routeId, routeOptions2),
       routeId,
       routeDefaultModel,
       routeLabel
@@ -576463,12 +576747,13 @@ async function loadDescriptorDiscoveryContext(routeId) {
       tone: "info"
     };
   }
+  const routeOptions = buildRouteCatalogModelOptions(routeLabel, mergedEntries, routeDefaultModel);
   return {
     kind: "descriptor",
     autoRefresh,
     canRefresh,
     discoveryState,
-    optionsOverride: buildRouteCatalogModelOptions(routeLabel, mergedEntries, routeDefaultModel),
+    optionsOverride: mergeActiveProfileModelOptions(routeId, routeOptions),
     routeId,
     routeDefaultModel,
     routeLabel
@@ -576614,7 +576899,7 @@ function ModelPickerWrapper({
         ...getOpenAIDiscoveryRequestOptions(discoveryContext.routeId),
         forceRefresh: true
       });
-      const nextOptions = buildRouteCatalogModelOptions(discoveryContext.routeLabel, result?.models ?? [], discoveryContext.routeDefaultModel);
+      const nextOptions = mergeActiveProfileModelOptions(discoveryContext.routeId, buildRouteCatalogModelOptions(discoveryContext.routeLabel, result?.models ?? [], discoveryContext.routeDefaultModel));
       const changed = !haveSameModelOptions(optionsOverride ?? [], nextOptions);
       setOptionsOverride(nextOptions);
       setDiscoveryState(descriptorDiscoveryStateForResult({
@@ -576790,7 +577075,7 @@ async function refreshModelsAndSummarize() {
       ...getOpenAIDiscoveryRequestOptions(discoveryContext.routeId),
       forceRefresh: true
     });
-    const nextOptions = buildRouteCatalogModelOptions(discoveryContext.routeLabel, result?.models ?? [], discoveryContext.routeDefaultModel);
+    const nextOptions = mergeActiveProfileModelOptions(discoveryContext.routeId, buildRouteCatalogModelOptions(discoveryContext.routeLabel, result?.models ?? [], discoveryContext.routeDefaultModel));
     const changed = !haveSameModelOptions(discoveryContext.optionsOverride, nextOptions);
     return descriptorDiscoveryStateForResult({
       changed,
@@ -576864,6 +577149,7 @@ var init_model2 = __esm(() => {
   init_discoveryCache();
   init_discoveryService();
   init_routeMetadata();
+  init_profileResolver();
   init_providerConfig();
   init_AppState();
   init_extraUsage();
@@ -596584,15 +596870,15 @@ ${deferredToolList}
       }
     }
     const maxOutputTokens2 = retryContext?.maxTokensOverride || options2.maxOutputTokensOverride || getMaxOutputTokensForModel(options2.model);
-    const hasThinking = thinkingConfig.type !== "disabled" && !isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_THINKING);
+    const hasThinking = shouldUseThinkingForModel(retryContext.model, thinkingConfig);
     let thinking = undefined;
-    if (hasThinking && modelSupportsThinking(options2.model)) {
-      if (!isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_ADAPTIVE_THINKING) && modelSupportsAdaptiveThinking(options2.model)) {
+    if (hasThinking) {
+      if (!isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_ADAPTIVE_THINKING) && modelSupportsAdaptiveThinking(retryContext.model)) {
         thinking = {
           type: "adaptive"
         };
       } else {
-        let thinkingBudget = getMaxThinkingTokensForModel(options2.model);
+        let thinkingBudget = getMaxThinkingTokensForModel(retryContext.model);
         if (thinkingConfig.type === "enabled" && thinkingConfig.budgetTokens !== undefined) {
           thinkingBudget = thinkingConfig.budgetTokens;
         }
@@ -599357,6 +599643,9 @@ function preconnectAnthropicApi() {
   if (fired)
     return;
   fired = true;
+  if (isEnvTruthy(process.env.CLAUDE_CODE_USE_OPENAI) || isEnvTruthy(process.env.CLAUDE_CODE_USE_GEMINI) || isEnvTruthy(process.env.CLAUDE_CODE_USE_GITHUB) || isEnvTruthy(process.env.CLAUDE_CODE_USE_MISTRAL)) {
+    return;
+  }
   if (getAPIProvider() !== "firstParty") {
     return;
   }
@@ -602177,8 +602466,8 @@ var init_types15 = __esm(() => {
     attribution: exports_external.object({
       commit: exports_external.string().optional().describe("Attribution text for git commits, including any trailers. " + "Empty string hides attribution."),
       pr: exports_external.string().optional().describe("Attribution text for pull request descriptions. " + "Empty string hides attribution.")
-    }).optional().describe("Customize attribution text for commits and PRs. " + "Each field defaults to the standard Claude Code attribution if not set."),
-    includeCoAuthoredBy: exports_external.boolean().optional().describe("Deprecated: Use attribution instead. " + "Whether to include Claude's co-authored by attribution in commits and PRs (defaults to true)"),
+    }).optional().describe("Customize attribution text for commits and PRs. " + "Unspecified fields are off by default; set a non-empty string to opt in."),
+    includeCoAuthoredBy: exports_external.boolean().optional().describe("Deprecated: Use attribution instead. " + "Whether to include Claude's co-authored by attribution in commits and PRs (defaults to false)"),
     includeGitInstructions: exports_external.boolean().optional().describe("Include built-in commit and PR workflow instructions in Claude's system prompt (default: true)"),
     permissions: PermissionsSchema().optional().describe("Tool usage permissions configuration"),
     model: exports_external.string().optional().describe("Override the default model used by Claude Code"),
@@ -604304,7 +604593,7 @@ function printStartupScreen(modelOverride) {
   const sLen = ` ● ${sL}    Ready — type /help to begin`.length;
   out.push(boxRow(sRow, W2, sLen, BORDER));
   out.push(`${ansiRgb(...BORDER)}╚${"═".repeat(W2 - 2)}╝${RESET2}`);
-  out.push(`  ${DIM2}${ansiRgb(...DIMCOL)}openclaude ${RESET2}${ansiRgb(...ACCENT)}v${"0.14.9"}${RESET2}`);
+  out.push(`  ${DIM2}${ansiRgb(...DIMCOL)}openclaude ${RESET2}${ansiRgb(...ACCENT)}v${"0.15.1"}${RESET2}`);
   out.push("");
   process.stdout.write(out.join(`
 `) + `
@@ -609076,7 +609365,7 @@ function QuestionNavigationBar(t0) {
       }
       const tabHeaders = questions.map(_temp157);
       const idealWidths = tabHeaders.map(_temp269);
-      const totalIdealWidth = idealWidths.reduce(_temp345, 0);
+      const totalIdealWidth = idealWidths.reduce(_temp344, 0);
       if (totalIdealWidth <= availableForTabs) {
         t2 = tabHeaders;
         break bb0;
@@ -609244,7 +609533,7 @@ function QuestionNavigationBar(t0) {
   }
   return t7;
 }
-function _temp345(sum, w) {
+function _temp344(sum, w) {
   return sum + w;
 }
 function _temp269(header_0) {
@@ -609835,7 +610124,7 @@ function QuestionView(t0) {
     t7 = $2[17];
   }
   const options2 = t7;
-  const hasAnyPreview = !question.multiSelect && question.options.some(_temp346);
+  const hasAnyPreview = !question.multiSelect && question.options.some(_temp345);
   if (hasAnyPreview) {
     let t82;
     if ($2[30] !== answers || $2[31] !== currentQuestionIndex || $2[32] !== hideSubmitTab || $2[33] !== minContentHeight || $2[34] !== minContentWidth || $2[35] !== onAnswer || $2[36] !== onCancel || $2[37] !== onFinishPlanInterview || $2[38] !== onRespondToClaude || $2[39] !== onTabNext || $2[40] !== onTabPrev || $2[41] !== onTextInputFocus || $2[42] !== onUpdateQuestionState || $2[43] !== question || $2[44] !== questionStates || $2[45] !== questions) {
@@ -610224,7 +610513,7 @@ function QuestionView(t0) {
 function _temp434(v) {
   return v !== "__other__";
 }
-function _temp346(opt_0) {
+function _temp345(opt_0) {
   return opt_0.preview;
 }
 function _temp270(opt) {
@@ -610922,7 +611211,7 @@ function AskUserQuestionPermissionRequestBody(t0) {
   const onRemoveImage = t8;
   let t9;
   if ($2[18] !== pastedContentsByQuestion) {
-    t9 = Object.values(pastedContentsByQuestion).flatMap(_temp271).filter(_temp347);
+    t9 = Object.values(pastedContentsByQuestion).flatMap(_temp271).filter(_temp346);
     $2[18] = pastedContentsByQuestion;
     $2[19] = t9;
   } else {
@@ -611363,7 +611652,7 @@ function _temp526(c_0) {
 function _temp435(s) {
   return s.toolPermissionContext.mode;
 }
-function _temp347(c6) {
+function _temp346(c6) {
   return c6.type === "image";
 }
 function _temp271(contents) {
@@ -612599,7 +612888,7 @@ function SuggestionDisplay(t0) {
               }, undefined, false, undefined, this),
               /* @__PURE__ */ jsx_dev_runtime379.jsxDEV(ThemedBox_default, {
                 flexDirection: "column",
-                children: directories.map(_temp348)
+                children: directories.map(_temp347)
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
@@ -612635,7 +612924,7 @@ function SuggestionDisplay(t0) {
   }
   return t1;
 }
-function _temp348(dir, index_0) {
+function _temp347(dir, index_0) {
   return /* @__PURE__ */ jsx_dev_runtime379.jsxDEV(ThemedText, {
     children: [
       figures_default.bullet,
@@ -618271,7 +618560,7 @@ function NotebookEditToolDiffInner(t0) {
       firstLine: new_source.split(`
 `)[0] ?? null,
       fileContent: oldSource
-    }, _.newStart, false, undefined, this)), _temp349) : /* @__PURE__ */ jsx_dev_runtime396.jsxDEV(HighlightedCode, {
+    }, _.newStart, false, undefined, this)), _temp348) : /* @__PURE__ */ jsx_dev_runtime396.jsxDEV(HighlightedCode, {
       code: new_source,
       filePath: cell_type === "markdown" ? "file.md" : notebook_path
     }, undefined, false, undefined, this);
@@ -618308,7 +618597,7 @@ function NotebookEditToolDiffInner(t0) {
   }
   return t10;
 }
-function _temp349(i3) {
+function _temp348(i3) {
   return /* @__PURE__ */ jsx_dev_runtime396.jsxDEV(NoSelect, {
     fromLeftEdge: true,
     children: /* @__PURE__ */ jsx_dev_runtime396.jsxDEV(ThemedText, {
@@ -622711,7 +623000,7 @@ function CompanionFloatingBubble() {
       if (!reaction) {
         return;
       }
-      const timer = setInterval(_temp350, TICK_MS2, setTick);
+      const timer = setInterval(_temp349, TICK_MS2, setTick);
       return () => clearInterval(timer);
     };
     t3 = [reaction];
@@ -622747,7 +623036,7 @@ function CompanionFloatingBubble() {
   }
   return t5;
 }
-function _temp350(set3) {
+function _temp349(set3) {
   return set3(_temp274);
 }
 function _temp274(s_0) {
@@ -628103,7 +628392,7 @@ function BridgeDialog(t0) {
   useRegisterOverlay("bridge-dialog");
   const connected = useAppState(_temp183);
   const sessionActive = useAppState(_temp276);
-  const reconnecting = useAppState(_temp351);
+  const reconnecting = useAppState(_temp350);
   const connectUrl = useAppState(_temp437);
   const sessionUrl = useAppState(_temp528);
   const error42 = useAppState(_temp622);
@@ -628531,7 +628820,7 @@ function _temp528(s_3) {
 function _temp437(s_2) {
   return s_2.replBridgeConnectUrl;
 }
-function _temp351(s_1) {
+function _temp350(s_1) {
   return s_1.replBridgeReconnecting;
 }
 function _temp276(s_0) {
@@ -629261,12 +629550,12 @@ function _temp438(query_0, controller_1, setMatches_0, setTruncated_0, setIsSear
       return;
     }
     if (collected === 0) {
-      setMatches_0(_temp352);
+      setMatches_0(_temp351);
     }
     setIsSearching_0(false);
   });
 }
-function _temp352(m_2) {
+function _temp351(m_2) {
   return m_2.length ? [] : m_2;
 }
 function _temp277() {}
@@ -629511,7 +629800,7 @@ function QuickOpenDialog(t0) {
         if (gen !== queryGenRef.current) {
           return;
         }
-        const paths2 = items.filter(_temp187).map(_temp278).filter(_temp353).map(_temp439);
+        const paths2 = items.filter(_temp187).map(_temp278).filter(_temp352).map(_temp439);
         setResults(paths2);
       });
     };
@@ -629702,7 +629991,7 @@ function _temp529(p_3) {
 function _temp439(p_0) {
   return p_0.split(path22.sep).join("/");
 }
-function _temp353(p) {
+function _temp352(p) {
   return !p.endsWith(path22.sep);
 }
 function _temp278(i_0) {
@@ -632342,7 +632631,7 @@ function BackgroundTaskStatus(t0) {
   const viewingAgentTaskId = useAppState(_temp280);
   let t3;
   if ($2[0] !== tasks2) {
-    t3 = Object.values(tasks2 ?? {}).filter(_temp354);
+    t3 = Object.values(tasks2 ?? {}).filter(_temp353);
     $2[0] = tasks2;
     $2[1] = t3;
   } else {
@@ -632627,7 +632916,7 @@ function _temp530(t_0) {
 function _temp440(s_1) {
   return s_1.expandedView;
 }
-function _temp354(t) {
+function _temp353(t) {
   return isBackgroundTask(t) && true;
 }
 function _temp280(s_0) {
@@ -640991,18 +641280,25 @@ async function initialize3() {
   if (initialized4 || disposed3)
     return;
   initialized4 = true;
+  unregisterCleanup = registerCleanup(async () => {
+    await dispose3();
+  });
   if (!dynamicSkillsCallbackRegistered) {
     dynamicSkillsCallbackRegistered = true;
-    onDynamicSkillsLoaded(() => {
-      clearCommandMemoizationCaches();
+    unregisterDynamicSkillsCallback = dependencies2.onDynamicSkillsLoaded(() => {
+      if (disposed3)
+        return;
+      dependencies2.clearCommandMemoizationCaches();
       skillsChanged.emit();
     });
   }
   const paths2 = await getWatchablePaths();
+  if (disposed3)
+    return;
   if (paths2.length === 0)
     return;
   logForDebugging(`Watching for changes in skill/command directories: ${paths2.join(", ")}...`);
-  watcher5 = esm_default.watch(paths2, {
+  watcher5 = dependencies2.watch(paths2, {
     persistent: true,
     ignoreInitial: true,
     depth: 2,
@@ -641023,9 +641319,6 @@ async function initialize3() {
   watcher5.on("add", handleChange3);
   watcher5.on("change", handleChange3);
   watcher5.on("unlink", handleChange3);
-  unregisterCleanup = registerCleanup(async () => {
-    await dispose3();
-  });
 }
 function dispose3() {
   disposed3 = true;
@@ -641033,6 +641326,11 @@ function dispose3() {
     unregisterCleanup();
     unregisterCleanup = null;
   }
+  if (unregisterDynamicSkillsCallback) {
+    unregisterDynamicSkillsCallback();
+    unregisterDynamicSkillsCallback = null;
+    dynamicSkillsCallbackRegistered = false;
+  }
   let closePromise = Promise.resolve();
   if (watcher5) {
     closePromise = watcher5.close();
@@ -641043,27 +641341,29 @@ function dispose3() {
     reloadTimer = null;
   }
   pendingChangedPaths.clear();
+  lastReloadTime = 0;
+  reloadInProgress = false;
   skillsChanged.clear();
   return closePromise;
 }
 async function getWatchablePaths() {
-  const fs5 = getFsImplementation();
+  const fs5 = dependencies2.getFsImplementation();
   const paths2 = [];
-  const userSkillsPath = getSkillsPath("userSettings", "skills");
+  const userSkillsPath = dependencies2.getSkillsPath("userSettings", "skills");
   if (userSkillsPath) {
     try {
       await fs5.stat(userSkillsPath);
       paths2.push(userSkillsPath);
     } catch {}
   }
-  const userCommandsPath = getSkillsPath("userSettings", "commands");
+  const userCommandsPath = dependencies2.getSkillsPath("userSettings", "commands");
   if (userCommandsPath) {
     try {
       await fs5.stat(userCommandsPath);
       paths2.push(userCommandsPath);
     } catch {}
   }
-  const projectSkillsPath = getSkillsPath("projectSettings", "skills");
+  const projectSkillsPath = dependencies2.getSkillsPath("projectSettings", "skills");
   if (projectSkillsPath) {
     try {
       const absolutePath = platformPath2.resolve(projectSkillsPath);
@@ -641071,7 +641371,7 @@ async function getWatchablePaths() {
       paths2.push(absolutePath);
     } catch {}
   }
-  const projectCommandsPath = getSkillsPath("projectSettings", "commands");
+  const projectCommandsPath = dependencies2.getSkillsPath("projectSettings", "commands");
   if (projectCommandsPath) {
     try {
       const absolutePath = platformPath2.resolve(projectCommandsPath);
@@ -641089,6 +641389,8 @@ async function getWatchablePaths() {
   return paths2;
 }
 function handleChange3(path24) {
+  if (disposed3)
+    return;
   logForDebugging(`Detected skill change: ${path24}`);
   logEvent("tengu_skill_file_changed", {
     source: "chokidar"
@@ -641096,40 +641398,80 @@ function handleChange3(path24) {
   scheduleReload(path24);
 }
 function scheduleReload(changedPath) {
+  if (disposed3)
+    return;
   pendingChangedPaths.add(changedPath);
+  if (reloadInProgress)
+    return;
+  scheduleReloadTimer();
+}
+function scheduleReloadTimer() {
   if (reloadTimer)
     clearTimeout(reloadTimer);
+  const debounceMs = testOverrides2?.reloadDebounce ?? RELOAD_DEBOUNCE_MS;
+  const reloadCooldownMs = testOverrides2?.reloadCooldown ?? RELOAD_COOLDOWN_MS;
+  const cooldownRemaining = lastReloadTime + reloadCooldownMs - Date.now();
+  const delay = Math.max(debounceMs, cooldownRemaining);
   reloadTimer = setTimeout(async () => {
     reloadTimer = null;
+    if (disposed3)
+      return;
     const paths2 = [...pendingChangedPaths];
     pendingChangedPaths.clear();
-    const results = await executeConfigChangeHooks("skills", paths2[0]);
-    if (hasBlockingResult(results)) {
-      logForDebugging(`ConfigChange hook blocked skill reload (${paths2.length} paths)`);
+    if (paths2.length === 0)
       return;
+    reloadInProgress = true;
+    try {
+      const results = await dependencies2.executeConfigChangeHooks("skills", paths2[0]);
+      if (dependencies2.hasBlockingResult(results)) {
+        logForDebugging(`ConfigChange hook blocked skill reload (${paths2.length} paths)`);
+        return;
+      }
+      if (disposed3)
+        return;
+      if (pendingChangedPaths.size > 0) {
+        logForDebugging(`Deferring skill reload because ${pendingChangedPaths.size} newer paths arrived during hooks`);
+        return;
+      }
+      dependencies2.clearCommandsCache();
+      dependencies2.resetSentSkillNames();
+      lastReloadTime = Date.now();
+      skillsChanged.emit();
+    } finally {
+      reloadInProgress = false;
+      if (!disposed3 && pendingChangedPaths.size > 0) {
+        scheduleReloadTimer();
+      }
     }
-    clearSkillCaches();
-    clearCommandsCache();
-    resetSentSkillNames();
-    skillsChanged.emit();
-  }, testOverrides2?.reloadDebounce ?? RELOAD_DEBOUNCE_MS);
+  }, delay);
 }
 async function resetForTesting2(overrides) {
   if (watcher5) {
     await watcher5.close();
     watcher5 = null;
   }
+  if (unregisterCleanup) {
+    unregisterCleanup();
+    unregisterCleanup = null;
+  }
+  if (unregisterDynamicSkillsCallback) {
+    unregisterDynamicSkillsCallback();
+    unregisterDynamicSkillsCallback = null;
+    dynamicSkillsCallbackRegistered = false;
+  }
   if (reloadTimer) {
     clearTimeout(reloadTimer);
     reloadTimer = null;
   }
   pendingChangedPaths.clear();
+  lastReloadTime = 0;
+  reloadInProgress = false;
   skillsChanged.clear();
   initialized4 = false;
   disposed3 = false;
   testOverrides2 = overrides ?? null;
 }
-var FILE_STABILITY_THRESHOLD_MS3 = 1000, FILE_STABILITY_POLL_INTERVAL_MS3 = 500, RELOAD_DEBOUNCE_MS = 300, POLLING_INTERVAL_MS3 = 2000, USE_POLLING, watcher5 = null, reloadTimer = null, pendingChangedPaths, initialized4 = false, disposed3 = false, dynamicSkillsCallbackRegistered = false, unregisterCleanup = null, skillsChanged, testOverrides2 = null, subscribe2, skillChangeDetector;
+var FILE_STABILITY_THRESHOLD_MS3 = 1000, FILE_STABILITY_POLL_INTERVAL_MS3 = 500, RELOAD_DEBOUNCE_MS = 3000, RELOAD_COOLDOWN_MS = 5000, POLLING_INTERVAL_MS3 = 2000, USE_POLLING, watcher5 = null, reloadTimer = null, pendingChangedPaths, lastReloadTime = 0, reloadInProgress = false, initialized4 = false, disposed3 = false, dynamicSkillsCallbackRegistered = false, unregisterDynamicSkillsCallback = null, unregisterCleanup = null, skillsChanged, testOverrides2 = null, defaultDependencies2, dependencies2, subscribe2, skillChangeDetector;
 var init_skillChangeDetector = __esm(() => {
   init_esm2();
   init_state();
@@ -641143,6 +641485,18 @@ var init_skillChangeDetector = __esm(() => {
   USE_POLLING = typeof Bun !== "undefined";
   pendingChangedPaths = new Set;
   skillsChanged = createSignal();
+  defaultDependencies2 = {
+    clearCommandMemoizationCaches,
+    clearCommandsCache,
+    executeConfigChangeHooks,
+    getFsImplementation,
+    getSkillsPath,
+    hasBlockingResult,
+    onDynamicSkillsLoaded,
+    resetSentSkillNames,
+    watch: esm_default.watch.bind(esm_default)
+  };
+  dependencies2 = defaultDependencies2;
   subscribe2 = skillsChanged.subscribe;
   skillChangeDetector = {
     initialize: initialize3,
@@ -642460,6 +642814,34 @@ var init_useInboxPoller = __esm(() => {
   import_react280 = __toESM(require_react(), 1);
 });
 
+// src/screens/replActiveAgentModel.ts
+function getActiveSessionAgentModelSelection({
+  agent: agent2,
+  baseMainLoopModel,
+  hasExplicitModelOverride,
+  hasAgentManagedModel
+}) {
+  if (hasExplicitModelOverride) {
+    return { shouldUpdateModel: false };
+  }
+  if (agent2.model && agent2.model !== "inherit") {
+    return {
+      shouldUpdateModel: true,
+      mainLoopModelForSession: parseUserSpecifiedModel(agent2.model)
+    };
+  }
+  if (!hasAgentManagedModel) {
+    return { shouldUpdateModel: false };
+  }
+  return {
+    shouldUpdateModel: true,
+    mainLoopModelForSession: baseMainLoopModel ?? getDefaultMainLoopModelSetting()
+  };
+}
+var init_replActiveAgentModel = __esm(() => {
+  init_model();
+});
+
 // src/hooks/useTaskListWatcher.ts
 var import_react281;
 var init_useTaskListWatcher = __esm(() => {
@@ -643730,7 +644112,7 @@ function usePostCompactSurvey(messages, isLoading, t0, t1) {
   import_react291.useEffect(t6, t7);
   let t8;
   if ($2[7] !== messages) {
-    t8 = new Set(messages.filter(_temp355).map(_temp441));
+    t8 = new Set(messages.filter(_temp354).map(_temp441));
     $2[7] = messages;
     $2[8] = t8;
   } else {
@@ -643809,7 +644191,7 @@ function usePostCompactSurvey(messages, isLoading, t0, t1) {
 function _temp441(msg_0) {
   return msg_0.uuid;
 }
-function _temp355(msg) {
+function _temp354(msg) {
   return isCompactBoundaryMessage(msg);
 }
 function _temp283(appearanceId_0, selected) {
@@ -646813,7 +647195,7 @@ function useMcpConnectivityStatus(t0) {
         }
         const failedLocalClients = mcpClients.filter(_temp204);
         const failedClaudeAiClients = mcpClients.filter(_temp286);
-        const needsAuthLocalServers = mcpClients.filter(_temp356);
+        const needsAuthLocalServers = mcpClients.filter(_temp355);
         const needsAuthClaudeAiServers = mcpClients.filter(_temp442);
         if (failedLocalClients.length === 0 && failedClaudeAiClients.length === 0 && needsAuthLocalServers.length === 0 && needsAuthClaudeAiServers.length === 0) {
           return;
@@ -646935,7 +647317,7 @@ function useMcpConnectivityStatus(t0) {
 function _temp442(client_2) {
   return client_2.type === "needs-auth" && client_2.config.type === "claudeai-proxy" && hasClaudeAiMcpEverConnected(client_2.name);
 }
-function _temp356(client_1) {
+function _temp355(client_1) {
   return client_1.type === "needs-auth" && client_1.config.type !== "claudeai-proxy";
 }
 function _temp286(client_0) {
@@ -647830,7 +648212,7 @@ function usePluginInstallationStatus() {
     const failedMarketplaces = t12;
     let t22;
     if ($2[3] !== installationStatus.plugins) {
-      t22 = installationStatus.plugins.filter(_temp357);
+      t22 = installationStatus.plugins.filter(_temp356);
       $2[3] = installationStatus.plugins;
       $2[4] = t22;
     } else {
@@ -647921,7 +648303,7 @@ function usePluginInstallationStatus() {
   }
   import_react300.useEffect(t1, t2);
 }
-function _temp357(p) {
+function _temp356(p) {
   return p.status === "failed";
 }
 function _temp289(m) {
@@ -649158,7 +649540,7 @@ function useFastModeNotification() {
         return;
       }
       return onFastModeOverageRejection((message) => {
-        setAppState(_temp358);
+        setAppState(_temp357);
         addNotification({
           key: OVERAGE_REJECTED_KEY,
           color: "warning",
@@ -649225,7 +649607,7 @@ function useFastModeNotification() {
   }
   import_react307.useEffect(t4, t5);
 }
-function _temp358(prev_0) {
+function _temp357(prev_0) {
   return {
     ...prev_0,
     fastMode: false
@@ -651022,6 +651404,8 @@ function REPL({
   onTurnComplete,
   disabled = false,
   mainThreadAgentDefinition: initialMainThreadAgentDefinition,
+  baseMainLoopModel = null,
+  hasExplicitModelOverride = false,
   disableSlashCommands = false,
   taskListId,
   remoteSessionConfig,
@@ -651085,6 +651469,34 @@ function REPL({
   const store = useAppStateStore();
   const terminal = useTerminalNotification();
   const mainLoopModel = useMainLoopModel();
+  const appMainLoopModel = useAppState((s) => s.mainLoopModel);
+  const appMainLoopModelForSession = useAppState((s) => s.mainLoopModelForSession);
+  const initialAgentModelSelection = !hasExplicitModelOverride && initialMainThreadAgentDefinition?.model && initialMainThreadAgentDefinition.model !== "inherit" ? getActiveSessionAgentModelSelection({
+    agent: initialMainThreadAgentDefinition,
+    baseMainLoopModel,
+    hasExplicitModelOverride,
+    hasAgentManagedModel: false
+  }) : undefined;
+  const explicitModelOverrideRef = import_react315.useRef(hasExplicitModelOverride);
+  const baseMainLoopModelRef = import_react315.useRef(baseMainLoopModel);
+  const agentManagedModelRef = import_react315.useRef(initialAgentModelSelection?.shouldUpdateModel ? initialAgentModelSelection.mainLoopModelForSession : undefined);
+  const previousMainLoopModelForSessionRef = import_react315.useRef(appMainLoopModelForSession);
+  const didTrackInitialModelStateRef = import_react315.useRef(false);
+  import_react315.useEffect(() => {
+    const previousMainLoopModelForSession = previousMainLoopModelForSessionRef.current;
+    previousMainLoopModelForSessionRef.current = appMainLoopModelForSession;
+    if (!didTrackInitialModelStateRef.current) {
+      didTrackInitialModelStateRef.current = true;
+      return;
+    }
+    const currentEffectiveModelSetting = appMainLoopModelForSession ?? appMainLoopModel;
+    const clearedAgentManagedSessionModel = previousMainLoopModelForSession !== null && appMainLoopModelForSession === null;
+    if (!clearedAgentManagedSessionModel && currentEffectiveModelSetting === agentManagedModelRef.current)
+      return;
+    explicitModelOverrideRef.current = true;
+    baseMainLoopModelRef.current = currentEffectiveModelSetting;
+    agentManagedModelRef.current = undefined;
+  }, [appMainLoopModel, appMainLoopModelForSession]);
   const [localCommands, setLocalCommands] = import_react315.useState(initialCommands);
   useSkillsChange(isRemoteSession ? undefined : getProjectRoot(), setLocalCommands);
   const proactiveActive = React165.useSyncExternalStore(proactiveModule5?.subscribeToProactiveChanges ?? PROACTIVE_NO_OP_SUBSCRIBE, proactiveModule5?.isProactiveActive ?? PROACTIVE_FALSE);
@@ -652228,6 +652640,31 @@ Error: sandbox required but unavailable: ${reason}
       },
       resume: resume2,
       setConversationId,
+      setActiveSessionAgent: (agent2) => {
+        const modelSelection = getActiveSessionAgentModelSelection({
+          agent: agent2,
+          baseMainLoopModel: baseMainLoopModelRef.current,
+          hasExplicitModelOverride: explicitModelOverrideRef.current,
+          hasAgentManagedModel: agentManagedModelRef.current !== undefined
+        });
+        setMainThreadAgentDefinition(agent2);
+        setMainThreadAgentType(agent2.agentType);
+        saveAgentSetting(agent2.agentType);
+        if (modelSelection.shouldUpdateModel) {
+          agentManagedModelRef.current = modelSelection.mainLoopModelForSession;
+          setMainLoopModelOverride(modelSelection.mainLoopModelForSession);
+          notifySessionMetadataChanged({
+            model: modelSelection.mainLoopModelForSession
+          });
+        }
+        setAppState((prev) => ({
+          ...prev,
+          agent: agent2.agentType,
+          ...modelSelection.shouldUpdateModel ? {
+            mainLoopModelForSession: modelSelection.mainLoopModelForSession
+          } : {}
+        }));
+      },
       requestPrompt,
       contentReplacementState: contentReplacementStateRef.current,
       syncToolResultReplacements
@@ -654350,9 +654787,11 @@ var init_REPL = __esm(() => {
   init_commitAttribution();
   init_sessionStorage();
   init_sessionRestore();
+  init_sessionState();
   init_concurrentSessions();
   init_RemoteAgentTask();
   init_useInboxPoller();
+  init_replActiveAgentModel();
   init_agentSwarmsEnabled();
   init_useTaskListWatcher();
   init_ide();
@@ -655615,7 +656054,7 @@ function WelcomeV2() {
             dimColor: true,
             children: [
               "v",
-              "0.14.9",
+              "0.15.1",
               " "
             ]
           }, undefined, true, undefined, this)
@@ -655815,7 +656254,7 @@ function WelcomeV2() {
           dimColor: true,
           children: [
             "v",
-            "0.14.9",
+            "0.15.1",
             " "
           ]
         }, undefined, true, undefined, this)
@@ -656041,7 +656480,7 @@ function AppleTerminalWelcomeV2(t0) {
         dimColor: true,
         children: [
           "v",
-          "0.14.9",
+          "0.15.1",
           " "
         ]
       }, undefined, true, undefined, this);
@@ -656295,7 +656734,7 @@ function AppleTerminalWelcomeV2(t0) {
       dimColor: true,
       children: [
         "v",
-        "0.14.9",
+        "0.15.1",
         " "
       ]
     }, undefined, true, undefined, this);
@@ -657463,9 +657902,9 @@ function _temp531(current) {
   };
 }
 function _temp443(command_0) {
-  return command_0.type === "prompt" && (command_0.loadedFrom === "skills" || command_0.loadedFrom === "plugin") && (command_0.source === "projectSettings" || command_0.source === "localSettings" || command_0.source === "plugin") && command_0.allowedTools?.some(_temp359);
+  return command_0.type === "prompt" && (command_0.loadedFrom === "skills" || command_0.loadedFrom === "plugin") && (command_0.source === "projectSettings" || command_0.source === "localSettings" || command_0.source === "plugin") && command_0.allowedTools?.some(_temp358);
 }
-function _temp359(tool_0) {
+function _temp358(tool_0) {
   return tool_0 === BASH_TOOL_NAME || tool_0.startsWith(BASH_TOOL_NAME + "(");
 }
 function _temp298(command10) {
@@ -658999,6 +659438,8 @@ function ResumeConversation({
   dynamicMcpConfig,
   debug,
   mainThreadAgentDefinition,
+  baseMainLoopModel,
+  hasExplicitModelOverride,
   autoConnectIdeFlag,
   strictMcpConfig = false,
   systemPrompt,
@@ -659220,6 +659661,8 @@ function ResumeConversation({
       systemPrompt,
       appendSystemPrompt,
       mainThreadAgentDefinition: resumeData.mainThreadAgentDefinition,
+      baseMainLoopModel,
+      hasExplicitModelOverride,
       autoConnectIdeFlag,
       disableSlashCommands,
       taskListId,
@@ -659333,7 +659776,7 @@ function CrossProjectMessage(t0) {
   } else {
     t1 = $2[0];
   }
-  import_react328.default.useEffect(_temp360, t1);
+  import_react328.default.useEffect(_temp359, t1);
   let t2;
   if ($2[1] === Symbol.for("react.memo_cache_sentinel")) {
     t2 = /* @__PURE__ */ jsx_dev_runtime488.jsxDEV(ThemedText, {
@@ -659399,7 +659842,7 @@ function CrossProjectMessage(t0) {
   }
   return t6;
 }
-function _temp360() {
+function _temp359() {
   const timeout2 = setTimeout(_temp2101, 100);
   return () => clearTimeout(timeout2);
 }
@@ -673840,7 +674283,7 @@ __export(exports_update, {
 async function update() {
   if (getAPIProvider() !== "firstParty") {
     writeToStdout(source_default.yellow(`Auto-update is not available for third-party provider builds.
-`) + `Current version: ${"0.14.9"}
+`) + `Current version: ${"0.15.1"}
 
 ` + `To update, reinstall from npm:
 ` + source_default.bold(`  npm install -g ${"@makerbi/openclaude"}@latest`) + `
@@ -673851,7 +674294,7 @@ async function update() {
     await gracefulShutdown(0);
   }
   logEvent("tengu_update_check", {});
-  writeToStdout(`Current version: ${"0.14.9"}
+  writeToStdout(`Current version: ${"0.15.1"}
 `);
   const channel = getInitialSettings()?.autoUpdatesChannel ?? "latest";
   writeToStdout(`Checking for updates to ${channel} version...
@@ -673936,8 +674379,8 @@ async function update() {
       writeToStdout(`Claude is managed by Homebrew.
 `);
       const latest = await getLatestVersion(channel);
-      if (latest && !gte("0.14.9", latest)) {
-        writeToStdout(`Update available: ${"0.14.9"} → ${latest}
+      if (latest && !gte("0.15.1", latest)) {
+        writeToStdout(`Update available: ${"0.15.1"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -673953,8 +674396,8 @@ async function update() {
       writeToStdout(`Claude is managed by winget.
 `);
       const latest = await getLatestVersion(channel);
-      if (latest && !gte("0.14.9", latest)) {
-        writeToStdout(`Update available: ${"0.14.9"} → ${latest}
+      if (latest && !gte("0.15.1", latest)) {
+        writeToStdout(`Update available: ${"0.15.1"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -673970,8 +674413,8 @@ async function update() {
       writeToStdout(`Claude is managed by apk.
 `);
       const latest = await getLatestVersion(channel);
-      if (latest && !gte("0.14.9", latest)) {
-        writeToStdout(`Update available: ${"0.14.9"} → ${latest}
+      if (latest && !gte("0.15.1", latest)) {
+        writeToStdout(`Update available: ${"0.15.1"} → ${latest}
 `);
         writeToStdout(`
 `);
@@ -674036,11 +674479,11 @@ async function update() {
 `);
         await gracefulShutdown(1);
       }
-      if (result.latestVersion === "0.14.9") {
-        writeToStdout(source_default.green(`OpenClaude is up to date (${"0.14.9"})`) + `
+      if (result.latestVersion === "0.15.1") {
+        writeToStdout(source_default.green(`OpenClaude is up to date (${"0.15.1"})`) + `
 `);
       } else {
-        writeToStdout(source_default.green(`Successfully updated from ${"0.14.9"} to version ${result.latestVersion}`) + `
+        writeToStdout(source_default.green(`Successfully updated from ${"0.15.1"} to version ${result.latestVersion}`) + `
 `);
         await regenerateCompletionCache();
       }
@@ -674100,12 +674543,12 @@ async function update() {
 `);
     await gracefulShutdown(1);
   }
-  if (latestVersion === "0.14.9") {
-    writeToStdout(source_default.green(`OpenClaude is up to date (${"0.14.9"})`) + `
+  if (latestVersion === "0.15.1") {
+    writeToStdout(source_default.green(`OpenClaude is up to date (${"0.15.1"})`) + `
 `);
     await gracefulShutdown(0);
   }
-  writeToStdout(`New version available: ${latestVersion} (current: ${"0.14.9"})
+  writeToStdout(`New version available: ${latestVersion} (current: ${"0.15.1"})
 `);
   writeToStdout(`Installing update...
 `);
@@ -674150,7 +674593,7 @@ async function update() {
   logForDebugging(`update: Installation status: ${status2}`);
   switch (status2) {
     case "success":
-      writeToStdout(source_default.green(`Successfully updated from ${"0.14.9"} to version ${latestVersion}`) + `
+      writeToStdout(source_default.green(`Successfully updated from ${"0.15.1"} to version ${latestVersion}`) + `
 `);
       await regenerateCompletionCache();
       break;
@@ -675120,6 +675563,8 @@ ${hint}` : hint;
     if (false) {}
     const userSpecifiedModel = options2.model === "default" ? getDefaultMainLoopModel() : options2.model;
     const userSpecifiedFallbackModel = fallbackModel === "default" ? getDefaultMainLoopModel() : fallbackModel;
+    const hasExplicitModelOverride = userSpecifiedModel !== undefined;
+    const baseMainLoopModel = userSpecifiedModel ?? getUserSpecifiedModelSetting() ?? null;
     const currentCwd2 = worktreeEnabled ? getCwd() : preSetupCwd;
     logForDebugging("[STARTUP] Loading commands and agents...");
     const commandsStart = Date.now();
@@ -675846,6 +676291,8 @@ ${customInstructions}` : customInstructions;
       mcpClients,
       autoConnectIdeFlag: ide2,
       mainThreadAgentDefinition,
+      baseMainLoopModel,
+      hasExplicitModelOverride,
       disableSlashCommands,
       dynamicMcpConfig,
       strictMcpConfig,
@@ -676203,7 +676650,7 @@ Usage: openclaude --remote "your task description"`, () => gracefulShutdown(1));
         pendingHookMessages
       }, renderAndRun);
     }
-  }).version("0.14.9 (OpenClaude)", "-v, --version", "Output the version number");
+  }).version("0.15.1 (OpenClaude)", "-v, --version", "Output the version number");
   program2.option("-w, --worktree [name]", "Create a new git worktree for this session (optionally specify a name)");
   program2.option("--tmux", "Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.");
   if (canUserConfigureAdvisor()) {
@@ -676780,7 +677227,7 @@ if (false) {}
 async function main2() {
   const args = process.argv.slice(2);
   if (args.length === 1 && (args[0] === "--version" || args[0] === "-v" || args[0] === "-V")) {
-    console.log(`${"0.14.9"} (OpenClaude)`);
+    console.log(`${"0.15.1"} (OpenClaude)`);
     return;
   }
   if (args.includes("--provider")) {
@@ -676933,4 +677380,4 @@ async function main2() {
 }
 main2();
 
-//# debugId=86F0C6D47371392E64756E2164756E21
+//# debugId=C804D214A872920D64756E2164756E21