@letta-ai/letta-code 0.26.5 → 0.26.6

package/letta.js

@@ -4997,7 +4997,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.26.5",
+    version: "0.26.6",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     packageManager: "bun@1.3.0",
@@ -140281,14 +140281,6 @@ async function updateLocalProvider(providerIdValue, apiKey, accessKey, region, p
     timeout: options3.timeout
   });
 }
-async function deleteLocalProvider(providerIdValue, storageDir) {
-  const file3 = readAuthFile(storageDir);
-  const provider = Object.values(file3.providers).find((record5) => record5.id === providerIdValue);
-  if (!provider)
-    return;
-  delete file3.providers[provider.name];
-  writeAuthFile(file3, storageDir);
-}
 async function removeLocalProviderByName(providerName, storageDir) {
   const file3 = readAuthFile(storageDir);
   if (!(providerName in file3.providers))
@@ -140622,13 +140614,6 @@ async function updateProvider2(providerId2, apiKey, accessKey, region, profile,
   }
   return updateProvider(providerId2, apiKey, accessKey, region, profile);
 }
-async function deleteProvider2(providerId2, options3 = {}) {
-  if (useLocalProviderStore(options3.target)) {
-    await deleteLocalProvider(providerId2);
-    return;
-  }
-  await deleteProvider(providerId2);
-}
 async function createOrUpdateProvider2(providerType, providerName, apiKey, accessKey, region, profile, options3 = {}, operationOptions = {}) {
   if (useLocalProviderStore(operationOptions.target)) {
     return createOrUpdateLocalProvider({
@@ -140878,9 +140863,6 @@ async function createOpenAICodexProvider(config3, options3 = {}) {
 async function updateOpenAICodexProvider(providerId2, config3, options3 = {}) {
   return updateProvider2(providerId2, encodeOAuthConfig(config3), undefined, undefined, undefined, options3);
 }
-async function deleteOpenAICodexProvider(providerId2, options3 = {}) {
-  await deleteProvider2(providerId2, options3);
-}
 async function createOrUpdateOpenAICodexProvider(config3, options3 = {}) {
   const existing = await getOpenAICodexProvider(options3);
   if (existing) {
@@ -140888,12 +140870,6 @@ async function createOrUpdateOpenAICodexProvider(config3, options3 = {}) {
   }
   return createOpenAICodexProvider(config3, options3);
 }
-async function removeOpenAICodexProvider(options3 = {}) {
-  const existing = await getOpenAICodexProvider(options3);
-  if (existing) {
-    await deleteOpenAICodexProvider(existing.id, options3);
-  }
-}
 var OPENAI_CODEX_PROVIDER_NAME = "chatgpt-plus-pro", CHATGPT_OAUTH_PROVIDER_TYPE = "chatgpt_oauth";
 var init_openai_codex_provider = __esm(() => {
   init_metadata();
@@ -144868,7 +144844,8 @@ function supportsDistinctAnthropicXHighEffort(modelHandle) {
   return modelHandle.includes("claude-opus-4-7") || modelHandle.includes("claude-opus-4-8");
 }
 function buildModelSettings(modelHandle, updateArgs) {
-  const isOpenAI = modelHandle.startsWith("openai/") || modelHandle.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`);
+  const isOpenAICodex = modelHandle.startsWith("openai-codex/");
+  const isOpenAI = modelHandle.startsWith("openai/") || isOpenAICodex || modelHandle.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`);
   const isAnthropic = modelHandle.startsWith("anthropic/") || modelHandle.startsWith("claude-pro-max/") || modelHandle.startsWith("minimax/");
   const isZai = modelHandle.startsWith("zai/");
   const isGoogleAI = modelHandle.startsWith("google_ai/");
@@ -144881,6 +144858,9 @@ function buildModelSettings(modelHandle, updateArgs) {
       provider_type: "openai",
       parallel_tool_calls: true
     };
+    if (isOpenAICodex) {
+      openaiSettings.provider_type = "chatgpt_oauth";
+    }
     if (updateArgs?.reasoning_effort) {
       openaiSettings.reasoning = {
         reasoning_effort: updateArgs.reasoning_effort
@@ -144893,6 +144873,9 @@ function buildModelSettings(modelHandle, updateArgs) {
     if (typeof updateArgs?.strict === "boolean") {
       openaiSettings.strict = updateArgs.strict;
     }
+    if (updateArgs && "service_tier" in updateArgs) {
+      openaiSettings.service_tier = updateArgs.service_tier === "priority" ? "priority" : null;
+    }
     settings3 = openaiSettings;
   } else if (isAnthropic) {
     const anthropicSettings = {
@@ -146760,6 +146743,7 @@ __export(exports_model, {
   normalizeModelHandleForRegistry: () => normalizeModelHandleForRegistry,
   models: () => models2,
   isLocalModelHandle: () => isLocalModelHandle,
+  isLocalChatGptOAuthModelHandle: () => isLocalChatGptOAuthModelHandle,
   getResumeRefreshArgs: () => getResumeRefreshArgs,
   getReasoningTierOptionsForHandle: () => getReasoningTierOptionsForHandle,
   getModelUpdateArgs: () => getModelUpdateArgs,
@@ -146771,7 +146755,9 @@ __export(exports_model, {
   getLocalModelLabel: () => getLocalModelLabel,
   getDefaultModelForTier: () => getDefaultModelForTier,
   getDefaultModel: () => getDefaultModel,
-  formatAvailableModels: () => formatAvailableModels
+  getChatGptFastRegistryHandleForModelHandle: () => getChatGptFastRegistryHandleForModelHandle,
+  formatAvailableModels: () => formatAvailableModels,
+  CHATGPT_FAST_SERVICE_TIER: () => CHATGPT_FAST_SERVICE_TIER
 });
 function isLocalModelHandle(modelHandle) {
   return LOCAL_MODEL_HANDLE_PREFIXES.some((prefix) => modelHandle.startsWith(prefix));
@@ -146783,10 +146769,50 @@ function getLocalModelLabel(modelHandle) {
 function isModelReasoningEffort(value) {
   return typeof value === "string" && REASONING_EFFORT_ORDER.includes(value);
 }
+function normalizeModelHandleForRegistry(modelHandle) {
+  if (!modelHandle)
+    return null;
+  const [provider, ...modelParts] = modelHandle.split("/");
+  const model = modelParts.join("/");
+  if ((provider === CHATGPT_OAUTH_LLM_CONFIG_PROVIDER || provider === LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX.slice(0, -1)) && model.length > 0 && !model.endsWith("-fast")) {
+    return `${OPENAI_CODEX_PROVIDER_NAME}/${model}`;
+  }
+  return modelHandle;
+}
+function modelPortion(modelHandle) {
+  const slashIndex = modelHandle.indexOf("/");
+  if (slashIndex === -1)
+    return null;
+  return modelHandle.slice(slashIndex + 1);
+}
+function isLocalChatGptOAuthModelHandle(modelHandle) {
+  return modelHandle.startsWith(LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX);
+}
+function getChatGptFastRegistryHandleForModelHandle(modelHandle) {
+  const [provider] = modelHandle.split("/");
+  if (provider !== LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX.slice(0, -1) && provider !== CHATGPT_OAUTH_LLM_CONFIG_PROVIDER) {
+    return null;
+  }
+  const normalized = normalizeModelHandleForRegistry(modelHandle);
+  if (!normalized?.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`))
+    return null;
+  const model = modelPortion(normalized);
+  if (!model || model.endsWith("-fast"))
+    return null;
+  const fastHandle = `${OPENAI_CODEX_PROVIDER_NAME}/${model}-fast`;
+  return models2.some((entry) => entry.handle === fastHandle) ? fastHandle : null;
+}
+function displayRegistryHandleForServiceTier(modelHandle, serviceTier) {
+  if (serviceTier === CHATGPT_FAST_SERVICE_TIER) {
+    return getChatGptFastRegistryHandleForModelHandle(modelHandle) ?? modelHandle;
+  }
+  return normalizeModelHandleForRegistry(modelHandle) ?? modelHandle;
+}
 function getReasoningTierOptionsForHandle(modelHandle, contextWindow) {
   const byEffort = new Map;
+  const registryHandle = normalizeModelHandleForRegistry(modelHandle) ?? modelHandle;
   for (const model of models2) {
-    if (model.handle !== modelHandle)
+    if (model.handle !== registryHandle)
       continue;
     if (contextWindow !== undefined) {
       const mCtx = model.updateArgs?.context_window;
@@ -146800,10 +146826,10 @@ function getReasoningTierOptionsForHandle(modelHandle, contextWindow) {
       byEffort.set(effort, model.id);
     }
   }
-  if (byEffort.size === 0 && isLocalModelHandle(modelHandle)) {
+  if (byEffort.size === 0 && isLocalModelHandle(registryHandle)) {
     return LOCAL_REASONING_EFFORT_ORDER.map((effort) => ({
       effort,
-      modelId: modelHandle
+      modelId: registryHandle
     }));
   }
   return REASONING_EFFORT_ORDER.flatMap((effort) => {
@@ -146847,14 +146873,16 @@ function getModelInfo(modelIdentifier) {
   const byId = models2.find((m2) => m2.id === modelIdentifier);
   if (byId)
     return byId;
-  const byHandle = models2.find((m2) => m2.handle === modelIdentifier);
+  const normalizedHandle = normalizeModelHandleForRegistry(modelIdentifier);
+  const byHandle = models2.find((m2) => m2.handle === normalizedHandle);
   if (byHandle)
     return byHandle;
   return null;
 }
 function getModelInfoForLlmConfig(modelHandle, llmConfig) {
-  const direct = getModelInfo(modelHandle);
-  let candidates2 = models2.filter((m2) => m2.handle === modelHandle);
+  const registryHandle = displayRegistryHandleForServiceTier(modelHandle, llmConfig?.service_tier ?? null);
+  const direct = getModelInfo(registryHandle);
+  let candidates2 = models2.filter((m2) => m2.handle === registryHandle);
   if (candidates2.length === 0) {
     return direct;
   }
@@ -146896,15 +146924,6 @@ function buildModelHandleFromConfig(config3) {
   }
   return config3.model ?? null;
 }
-function normalizeModelHandleForRegistry(modelHandle) {
-  if (!modelHandle)
-    return null;
-  const [provider, ...modelParts] = modelHandle.split("/");
-  if (provider === "chatgpt_oauth" && modelParts.length > 0) {
-    return `${OPENAI_CODEX_PROVIDER_NAME}/${modelParts.join("/")}`;
-  }
-  return modelHandle;
-}
 function shouldPreserveContextWindowForModelSelection(input) {
   const currentRegistryModelHandle = normalizeModelHandleForRegistry(input.currentModelHandle ?? buildModelHandleFromConfig(input.currentLlmConfig));
   const selectedRegistryModelHandle = normalizeModelHandleForRegistry(input.selectedModelHandle);
@@ -146965,22 +146984,23 @@ function getResumeRefreshArgs(presetUpdateArgs, agent2) {
 }
 function findModelByHandle(handle) {
   const pickPreferred = (candidates2) => candidates2.find((m2) => m2.isDefault) ?? candidates2.find((m2) => m2.isFeatured) ?? candidates2.find((m2) => m2.updateArgs?.reasoning_effort === "medium") ?? candidates2.find((m2) => m2.updateArgs?.reasoning_effort === "high") ?? candidates2[0] ?? null;
-  const exactMatch = models2.find((m2) => m2.handle === handle);
+  const registryHandle = normalizeModelHandleForRegistry(handle) ?? handle;
+  const exactMatch = models2.find((m2) => m2.handle === registryHandle);
   if (exactMatch)
     return exactMatch;
-  const [provider, ...rest3] = handle.split("/");
+  const [provider, ...rest3] = registryHandle.split("/");
   if (provider && rest3.length > 0) {
-    const modelPortion = rest3.join("/");
+    const modelPortion2 = rest3.join("/");
     const providerMatches = models2.filter((m2) => {
       if (!m2.handle.startsWith(`${provider}/`))
         return false;
       const mModelPortion = m2.handle.slice(provider.length + 1);
-      return mModelPortion.includes(modelPortion) || modelPortion.includes(mModelPortion);
+      return mModelPortion.includes(modelPortion2) || modelPortion2.includes(mModelPortion);
     });
     const providerMatch = pickPreferred(providerMatches);
     if (providerMatch)
       return providerMatch;
-    const suffixMatches = models2.filter((m2) => m2.handle.endsWith(`/${modelPortion}`));
+    const suffixMatches = models2.filter((m2) => m2.handle.endsWith(`/${modelPortion2}`));
     const suffixMatch = pickPreferred(suffixMatches);
     if (suffixMatch)
       return suffixMatch;
@@ -147009,7 +147029,7 @@ function resolveModelByLlmConfig(llmConfigModel) {
     return exactMatch.id;
   return null;
 }
-var models2, REASONING_EFFORT_ORDER, LOCAL_REASONING_EFFORT_ORDER, LOCAL_MODEL_HANDLE_PREFIXES, RESUME_REFRESH_FIELDS;
+var models2, REASONING_EFFORT_ORDER, LOCAL_REASONING_EFFORT_ORDER, LOCAL_MODEL_HANDLE_PREFIXES, LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX = "openai-codex/", CHATGPT_OAUTH_LLM_CONFIG_PROVIDER = "chatgpt_oauth", CHATGPT_FAST_SERVICE_TIER = "priority", RESUME_REFRESH_FIELDS;
 var init_model = __esm(() => {
   init_models7();
   init_openai_codex_provider();
@@ -164450,6 +164470,8 @@ var init_Edit = () => {};
 // src/tools/descriptions/ExecCommand.md
 var ExecCommand_default = `Runs a command in a PTY, returning output or a session ID for ongoing interaction.
 
+For ordinary one-shot commands, omit \`yield_time_ms\` and let the default wait for completion; set \`yield_time_ms\` only when intentionally returning early from a long-running or interactive command.
+
 # Committing changes with git
 
 Only create commits when requested by the user. If unclear, ask first. When the user asks you to create a new git commit, follow these steps carefully:
@@ -172212,8 +172234,33 @@ var init_shell = __esm(() => {
 
 // src/tools/impl/exec-command.ts
 import { spawn as spawn6 } from "node:child_process";
-function sleep8(ms) {
-  return new Promise((resolve13) => setTimeout(resolve13, ms));
+function createAbortError() {
+  const error54 = new Error("The operation was aborted");
+  error54.name = "AbortError";
+  return error54;
+}
+function throwIfAborted(signal) {
+  if (signal?.aborted) {
+    throw createAbortError();
+  }
+}
+function sleep8(ms, signal) {
+  if (!signal) {
+    return new Promise((resolve13) => setTimeout(resolve13, ms));
+  }
+  throwIfAborted(signal);
+  return new Promise((resolve13, reject) => {
+    const timer = setTimeout(() => {
+      signal.removeEventListener("abort", onAbort);
+      resolve13();
+    }, ms);
+    const onAbort = () => {
+      clearTimeout(timer);
+      signal.removeEventListener("abort", onAbort);
+      reject(createAbortError());
+    };
+    signal.addEventListener("abort", onAbort, { once: true });
+  });
 }
 function clampYieldTime(value, fallback) {
   const time3 = Number.isFinite(value) ? Number(value) : fallback;
@@ -172532,6 +172579,7 @@ async function waitForSessionOutput(params) {
   const startTime = Date.now();
   const deadline = startTime + params.yieldTimeMs;
   let emittedOffset = params.startOffset;
+  throwIfAborted(params.signal);
   while (Date.now() < deadline && params.session.status === "running") {
     if (params.onOutput && params.session.output.length > emittedOffset) {
       for (const chunk of getSessionOutputChunks(params.session, emittedOffset, params.session.output.length)) {
@@ -172539,8 +172587,9 @@ async function waitForSessionOutput(params) {
       }
       emittedOffset = params.session.output.length;
     }
-    await sleep8(25);
+    await sleep8(25, params.signal);
   }
+  throwIfAborted(params.signal);
   if (params.onOutput && params.session.output.length > emittedOffset) {
     for (const chunk of getSessionOutputChunks(params.session, emittedOffset, params.session.output.length)) {
       params.onOutput(chunk.text, chunk.stream);
@@ -172619,6 +172668,7 @@ async function exec_command(args) {
     session,
     startOffset: 0,
     yieldTimeMs,
+    signal: args.signal,
     onOutput: args.onOutput
   });
   const sessionId = session.status === "running" ? session.id : null;
@@ -172652,7 +172702,7 @@ async function write_stdin(args) {
   }
   if (chars) {
     backgroundProcess.process.write(chars);
-    await sleep8(100);
+    await sleep8(100, args.signal);
   }
   const startOffset = session.readOffset;
   const yieldTimeMs = clampWriteStdinYieldTime(args.yield_time_ms, chars);
@@ -172660,6 +172710,7 @@ async function write_stdin(args) {
     session,
     startOffset,
     yieldTimeMs,
+    signal: args.signal,
     onOutput: args.onOutput
   });
   const nextSessionId = session.status === "running" ? session.id : null;
@@ -189126,8 +189177,8 @@ function swapProviderPrefix(parentHandle, recommendedHandle) {
   const recommendedProvider = getProviderPrefix(recommendedHandle);
   if (!recommendedProvider || recommendedProvider !== baseProvider)
     return null;
-  const modelPortion = recommendedHandle.slice(recommendedProvider.length + 1);
-  return `${parentProvider}/${modelPortion}`;
+  const modelPortion2 = recommendedHandle.slice(recommendedProvider.length + 1);
+  return `${parentProvider}/${modelPortion2}`;
 }
 async function resolveSubagentModel(options3) {
   const { userModel, recommendedModel, parentModelHandle, billingTier } = options3;
@@ -202861,14 +202912,23 @@ function resolveZaiConnection(options3) {
 }
 function getCatalogModel(provider, modelId, oauthCredentials) {
   const spec = getPiProviderSpec(provider);
-  if (!spec.piProvider)
+  const piProvider = spec.piProvider;
+  if (!piProvider)
     return;
-  const model = getModels(spec.piProvider).find((model2) => model2.id === modelId);
+  const catalog = getModels(piProvider);
+  const fallbackModelId = fallbackCatalogModelId(piProvider, modelId);
+  const model = catalog.find((model2) => model2.id === modelId) ?? catalog.find((model2) => model2.id === fallbackModelId);
   if (!model || !oauthCredentials)
     return model;
-  const oauthProvider = getOAuthProvider(spec.piProvider);
+  const oauthProvider = getOAuthProvider(piProvider);
   return oauthProvider?.modifyModels?.([model], oauthCredentials)[0] ?? model;
 }
+function fallbackCatalogModelId(provider, modelId) {
+  if (provider !== "openai")
+    return;
+  const withoutReleaseDate = modelId.replace(/-\d{4}-\d{2}-\d{2}$/, "");
+  return withoutReleaseDate === modelId ? undefined : withoutReleaseDate;
+}
 function customOpenAICompatibleModel(input) {
   return {
     id: input.modelId,
@@ -203526,6 +203586,11 @@ function maxTokensForSettings(modelSettings) {
   const maxTokens = modelSettings.max_tokens;
   return typeof maxTokens === "number" && Number.isFinite(maxTokens) ? maxTokens : undefined;
 }
+function serviceTierForSettings(model, modelSettings) {
+  if (model.api !== "openai-codex-responses")
+    return;
+  return modelSettings.service_tier === "priority" ? "priority" : undefined;
+}
 function toLocalAssistantMessage(message, input) {
   return {
     id: message.responseId ?? `local-assistant-${Date.now()}`,
@@ -203624,6 +203689,9 @@ class PiStreamAdapter {
       sessionId: input.conversationId,
       ...reasoningForSettings(input.agent.model_settings) ? { reasoning: reasoningForSettings(input.agent.model_settings) } : {},
       ...maxTokensForSettings(input.agent.model_settings) ? { maxTokens: maxTokensForSettings(input.agent.model_settings) } : {},
+      ...serviceTierForSettings(resolved.model, input.agent.model_settings) ? {
+        serviceTier: serviceTierForSettings(resolved.model, input.agent.model_settings)
+      } : {},
       ...boolValue(input.agent.model_settings.parallel_tool_calls) !== undefined ? {
         parallelToolCalls: boolValue(input.agent.model_settings.parallel_tool_calls)
       } : {}
@@ -205453,6 +205521,7 @@ __export(exports_model2, {
   normalizeModelHandleForRegistry: () => normalizeModelHandleForRegistry2,
   models: () => models3,
   isLocalModelHandle: () => isLocalModelHandle2,
+  isLocalChatGptOAuthModelHandle: () => isLocalChatGptOAuthModelHandle2,
   getResumeRefreshArgs: () => getResumeRefreshArgs2,
   getReasoningTierOptionsForHandle: () => getReasoningTierOptionsForHandle2,
   getModelUpdateArgs: () => getModelUpdateArgs2,
@@ -205464,7 +205533,9 @@ __export(exports_model2, {
   getLocalModelLabel: () => getLocalModelLabel2,
   getDefaultModelForTier: () => getDefaultModelForTier2,
   getDefaultModel: () => getDefaultModel2,
-  formatAvailableModels: () => formatAvailableModels2
+  getChatGptFastRegistryHandleForModelHandle: () => getChatGptFastRegistryHandleForModelHandle2,
+  formatAvailableModels: () => formatAvailableModels2,
+  CHATGPT_FAST_SERVICE_TIER: () => CHATGPT_FAST_SERVICE_TIER2
 });
 function isLocalModelHandle2(modelHandle) {
   return LOCAL_MODEL_HANDLE_PREFIXES2.some((prefix) => modelHandle.startsWith(prefix));
@@ -205476,10 +205547,50 @@ function getLocalModelLabel2(modelHandle) {
 function isModelReasoningEffort2(value) {
   return typeof value === "string" && REASONING_EFFORT_ORDER2.includes(value);
 }
+function normalizeModelHandleForRegistry2(modelHandle) {
+  if (!modelHandle)
+    return null;
+  const [provider, ...modelParts] = modelHandle.split("/");
+  const model = modelParts.join("/");
+  if ((provider === CHATGPT_OAUTH_LLM_CONFIG_PROVIDER2 || provider === LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX2.slice(0, -1)) && model.length > 0 && !model.endsWith("-fast")) {
+    return `${OPENAI_CODEX_PROVIDER_NAME}/${model}`;
+  }
+  return modelHandle;
+}
+function modelPortion2(modelHandle) {
+  const slashIndex = modelHandle.indexOf("/");
+  if (slashIndex === -1)
+    return null;
+  return modelHandle.slice(slashIndex + 1);
+}
+function isLocalChatGptOAuthModelHandle2(modelHandle) {
+  return modelHandle.startsWith(LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX2);
+}
+function getChatGptFastRegistryHandleForModelHandle2(modelHandle) {
+  const [provider] = modelHandle.split("/");
+  if (provider !== LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX2.slice(0, -1) && provider !== CHATGPT_OAUTH_LLM_CONFIG_PROVIDER2) {
+    return null;
+  }
+  const normalized = normalizeModelHandleForRegistry2(modelHandle);
+  if (!normalized?.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`))
+    return null;
+  const model = modelPortion2(normalized);
+  if (!model || model.endsWith("-fast"))
+    return null;
+  const fastHandle = `${OPENAI_CODEX_PROVIDER_NAME}/${model}-fast`;
+  return models3.some((entry) => entry.handle === fastHandle) ? fastHandle : null;
+}
+function displayRegistryHandleForServiceTier2(modelHandle, serviceTier) {
+  if (serviceTier === CHATGPT_FAST_SERVICE_TIER2) {
+    return getChatGptFastRegistryHandleForModelHandle2(modelHandle) ?? modelHandle;
+  }
+  return normalizeModelHandleForRegistry2(modelHandle) ?? modelHandle;
+}
 function getReasoningTierOptionsForHandle2(modelHandle, contextWindow) {
   const byEffort = new Map;
+  const registryHandle = normalizeModelHandleForRegistry2(modelHandle) ?? modelHandle;
   for (const model of models3) {
-    if (model.handle !== modelHandle)
+    if (model.handle !== registryHandle)
       continue;
     if (contextWindow !== undefined) {
       const mCtx = model.updateArgs?.context_window;
@@ -205493,10 +205604,10 @@ function getReasoningTierOptionsForHandle2(modelHandle, contextWindow) {
       byEffort.set(effort, model.id);
     }
   }
-  if (byEffort.size === 0 && isLocalModelHandle2(modelHandle)) {
+  if (byEffort.size === 0 && isLocalModelHandle2(registryHandle)) {
     return LOCAL_REASONING_EFFORT_ORDER2.map((effort) => ({
       effort,
-      modelId: modelHandle
+      modelId: registryHandle
     }));
   }
   return REASONING_EFFORT_ORDER2.flatMap((effort) => {
@@ -205540,14 +205651,16 @@ function getModelInfo2(modelIdentifier) {
   const byId = models3.find((m2) => m2.id === modelIdentifier);
   if (byId)
     return byId;
-  const byHandle = models3.find((m2) => m2.handle === modelIdentifier);
+  const normalizedHandle = normalizeModelHandleForRegistry2(modelIdentifier);
+  const byHandle = models3.find((m2) => m2.handle === normalizedHandle);
   if (byHandle)
     return byHandle;
   return null;
 }
 function getModelInfoForLlmConfig2(modelHandle, llmConfig) {
-  const direct = getModelInfo2(modelHandle);
-  let candidates2 = models3.filter((m2) => m2.handle === modelHandle);
+  const registryHandle = displayRegistryHandleForServiceTier2(modelHandle, llmConfig?.service_tier ?? null);
+  const direct = getModelInfo2(registryHandle);
+  let candidates2 = models3.filter((m2) => m2.handle === registryHandle);
   if (candidates2.length === 0) {
     return direct;
   }
@@ -205589,15 +205702,6 @@ function buildModelHandleFromConfig2(config3) {
   }
   return config3.model ?? null;
 }
-function normalizeModelHandleForRegistry2(modelHandle) {
-  if (!modelHandle)
-    return null;
-  const [provider, ...modelParts] = modelHandle.split("/");
-  if (provider === "chatgpt_oauth" && modelParts.length > 0) {
-    return `${OPENAI_CODEX_PROVIDER_NAME}/${modelParts.join("/")}`;
-  }
-  return modelHandle;
-}
 function shouldPreserveContextWindowForModelSelection2(input) {
   const currentRegistryModelHandle = normalizeModelHandleForRegistry2(input.currentModelHandle ?? buildModelHandleFromConfig2(input.currentLlmConfig));
   const selectedRegistryModelHandle = normalizeModelHandleForRegistry2(input.selectedModelHandle);
@@ -205658,22 +205762,23 @@ function getResumeRefreshArgs2(presetUpdateArgs, agent2) {
 }
 function findModelByHandle2(handle) {
   const pickPreferred = (candidates2) => candidates2.find((m2) => m2.isDefault) ?? candidates2.find((m2) => m2.isFeatured) ?? candidates2.find((m2) => m2.updateArgs?.reasoning_effort === "medium") ?? candidates2.find((m2) => m2.updateArgs?.reasoning_effort === "high") ?? candidates2[0] ?? null;
-  const exactMatch = models3.find((m2) => m2.handle === handle);
+  const registryHandle = normalizeModelHandleForRegistry2(handle) ?? handle;
+  const exactMatch = models3.find((m2) => m2.handle === registryHandle);
   if (exactMatch)
     return exactMatch;
-  const [provider, ...rest3] = handle.split("/");
+  const [provider, ...rest3] = registryHandle.split("/");
   if (provider && rest3.length > 0) {
-    const modelPortion = rest3.join("/");
+    const modelPortion3 = rest3.join("/");
     const providerMatches = models3.filter((m2) => {
       if (!m2.handle.startsWith(`${provider}/`))
         return false;
       const mModelPortion = m2.handle.slice(provider.length + 1);
-      return mModelPortion.includes(modelPortion) || modelPortion.includes(mModelPortion);
+      return mModelPortion.includes(modelPortion3) || modelPortion3.includes(mModelPortion);
     });
     const providerMatch = pickPreferred(providerMatches);
     if (providerMatch)
       return providerMatch;
-    const suffixMatches = models3.filter((m2) => m2.handle.endsWith(`/${modelPortion}`));
+    const suffixMatches = models3.filter((m2) => m2.handle.endsWith(`/${modelPortion3}`));
     const suffixMatch = pickPreferred(suffixMatches);
     if (suffixMatch)
       return suffixMatch;
@@ -205702,7 +205807,7 @@ function resolveModelByLlmConfig2(llmConfigModel) {
     return exactMatch.id;
   return null;
 }
-var models3, REASONING_EFFORT_ORDER2, LOCAL_REASONING_EFFORT_ORDER2, LOCAL_MODEL_HANDLE_PREFIXES2, RESUME_REFRESH_FIELDS2;
+var models3, REASONING_EFFORT_ORDER2, LOCAL_REASONING_EFFORT_ORDER2, LOCAL_MODEL_HANDLE_PREFIXES2, LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX2 = "openai-codex/", CHATGPT_OAUTH_LLM_CONFIG_PROVIDER2 = "chatgpt_oauth", CHATGPT_FAST_SERVICE_TIER2 = "priority", RESUME_REFRESH_FIELDS2;
 var init_model2 = __esm(() => {
   init_models7();
   init_openai_codex_provider();
@@ -256021,6 +256126,23 @@ var init_memory_subagent_completion = __esm(() => {
   init_system_prompt_warning();
 });
 
+// src/cli/helpers/reflection-gate.ts
+function isReflectionSubagentActive(subagents, agentId, conversationId) {
+  return subagents.some((agent2) => {
+    if (agent2.type.toLowerCase() !== "reflection") {
+      return false;
+    }
+    if (agent2.status !== "pending" && agent2.status !== "running") {
+      return false;
+    }
+    if (!agent2.parentAgentId) {
+      return false;
+    }
+    const parentConversationId = agent2.parentConversationId ?? "default";
+    return agent2.parentAgentId === agentId && parentConversationId === conversationId;
+  });
+}
+
 // src/utils/file-lock.ts
 import { open as open3, readFile as readFile11, stat as stat9, unlink as unlink3 } from "node:fs/promises";
 async function withFileLock(lockPath, fn, options3) {
@@ -256739,6 +256861,121 @@ var init_reflection_transcript = __esm(() => {
   stateMutexes = new Map;
 });
 
+// src/cli/helpers/reflection-launcher.ts
+async function resolveSystemPrompt2(agentId, systemPrompt) {
+  if (systemPrompt) {
+    return systemPrompt;
+  }
+  try {
+    const agent2 = await getBackend().retrieveAgent(agentId);
+    return agent2.system ?? undefined;
+  } catch {
+    debugLog("memory", "Failed to fetch agent system prompt for reflection payload");
+    return;
+  }
+}
+function resolveCompletionConversationId(completionConversationId, fallback) {
+  if (typeof completionConversationId === "function") {
+    return completionConversationId();
+  }
+  return completionConversationId ?? fallback;
+}
+async function launchReflectionSubagent(options3) {
+  const {
+    agentId,
+    conversationId,
+    memfsEnabled,
+    triggerSource,
+    description,
+    recompileByConversation,
+    recompileQueuedByConversation,
+    onCompletionMessage
+  } = options3;
+  if (!memfsEnabled) {
+    return { launched: false, reason: "memfs_disabled" };
+  }
+  if (isReflectionSubagentActive(getSubagents(), agentId, conversationId)) {
+    debugLog("memory", `Skipping reflection launch (${triggerSource}) because one is already active`);
+    return { launched: false, reason: "already_active" };
+  }
+  try {
+    const systemPrompt = await resolveSystemPrompt2(agentId, options3.systemPrompt);
+    const autoPayload = await buildAutoReflectionPayload(agentId, conversationId, systemPrompt);
+    if (!autoPayload) {
+      debugLog("memory", `Skipping reflection launch (${triggerSource}) because transcript has no new content`);
+      return { launched: false, reason: "no_payload" };
+    }
+    const memoryDir = getScopedMemoryFilesystemRoot(agentId);
+    const parentMemory = await buildParentMemorySnapshot(memoryDir);
+    const reflectionPrompt = buildReflectionSubagentPrompt({
+      memoryDir,
+      parentMemory
+    });
+    const { spawnBackgroundSubagentTask: spawnBackgroundSubagentTask2, waitForBackgroundSubagentAgentId: waitForBackgroundSubagentAgentId2 } = await Promise.resolve().then(() => (init_task(), exports_task));
+    const { subagentId } = spawnBackgroundSubagentTask2({
+      subagentType: "reflection",
+      prompt: reflectionPrompt,
+      description,
+      silentCompletion: true,
+      transcriptPath: autoPayload.payloadPath,
+      parentScope: { agentId, conversationId },
+      onComplete: async ({ success: success2, error: error54, agentId: reflectionAgentId2 }) => {
+        telemetry.trackReflectionEnd(triggerSource, success2, {
+          subagentId: reflectionAgentId2 ?? undefined,
+          conversationId,
+          error: error54
+        });
+        await finalizeAutoReflectionPayload(agentId, conversationId, autoPayload.payloadPath, autoPayload.endSnapshotLine, success2);
+        const completionMessage = await handleMemorySubagentCompletion({
+          agentId,
+          conversationId: resolveCompletionConversationId(options3.completionConversationId, conversationId),
+          subagentType: "reflection",
+          success: success2,
+          error: error54
+        }, {
+          recompileByConversation,
+          recompileQueuedByConversation,
+          logRecompileFailure: (message) => debugWarn("memory", message)
+        });
+        await onCompletionMessage?.(completionMessage, {
+          success: success2,
+          error: error54,
+          reflectionAgentId: reflectionAgentId2 ?? undefined
+        });
+      }
+    });
+    const reflectionAgentId = await waitForBackgroundSubagentAgentId2(subagentId, 1000);
+    telemetry.trackReflectionStart(triggerSource, {
+      subagentId: reflectionAgentId ?? undefined,
+      conversationId,
+      startMessageId: autoPayload.startMessageId,
+      endMessageId: autoPayload.endMessageId
+    });
+    debugLog("memory", `Launched reflection subagent (${triggerSource})`);
+    return {
+      launched: true,
+      payloadPath: autoPayload.payloadPath,
+      subagentId,
+      reflectionAgentId: reflectionAgentId ?? undefined,
+      startMessageId: autoPayload.startMessageId,
+      endMessageId: autoPayload.endMessageId
+    };
+  } catch (error54) {
+    debugWarn("memory", `Failed to launch reflection subagent (${triggerSource}): ${error54 instanceof Error ? error54.message : String(error54)}`);
+    return { launched: false, reason: "error", error: error54 };
+  }
+}
+var AUTO_REFLECTION_DESCRIPTION = "Reflect on recent conversations";
+var init_reflection_launcher = __esm(() => {
+  init_memory_filesystem2();
+  init_subagent_state();
+  init_backend2();
+  init_memory_subagent_completion();
+  init_reflection_transcript();
+  init_telemetry();
+  init_debug();
+});
+
 // src/cli/helpers/agent-info.ts
 function getRelativeTime(dateStr) {
   const date6 = new Date(dateStr);
@@ -260664,107 +260901,39 @@ function trackListenerUserInput(messages, modelId) {
     telemetry.trackUserInput(inputText, "user", modelId);
   }
 }
-function hasActiveReflectionSubagent(agentId, conversationId) {
-  return getSubagents().some((agent2) => {
-    if (agent2.type.toLowerCase() !== "reflection") {
-      return false;
-    }
-    if (agent2.status !== "pending" && agent2.status !== "running") {
-      return false;
-    }
-    if (!agent2.parentAgentId) {
-      return false;
-    }
-    const parentConversationId = agent2.parentConversationId ?? "default";
-    return agent2.parentAgentId === agentId && parentConversationId === conversationId;
-  });
-}
 function escapeTaskNotificationSummary(summary) {
   return summary.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 function buildMaybeLaunchReflectionSubagent(params) {
   return async (triggerSource) => {
     const { runtime, socket, agentId, conversationId, cachedAgent } = params;
-    if (!agentId || !settingsManager.isMemfsEnabled(agentId)) {
-      return false;
-    }
-    if (hasActiveReflectionSubagent(agentId, conversationId)) {
-      debugLog("memory", `Skipping auto reflection launch (${triggerSource}) because one is already active`);
+    if (!agentId) {
       return false;
     }
-    try {
-      let systemPrompt = cachedAgent?.system ?? undefined;
-      if (!systemPrompt) {
-        try {
-          const agent2 = await getBackend().retrieveAgent(agentId);
-          systemPrompt = agent2.system ?? undefined;
-        } catch {
-          debugLog("memory", "Failed to fetch agent system prompt for reflection payload");
-        }
-      }
-      const autoPayload = await buildAutoReflectionPayload(agentId, conversationId, systemPrompt);
-      if (!autoPayload) {
-        debugLog("memory", `Skipping auto reflection launch (${triggerSource}) because transcript has no new content`);
-        return false;
+    const result = await launchReflectionSubagent({
+      agentId,
+      conversationId,
+      memfsEnabled: settingsManager.isMemfsEnabled(agentId),
+      triggerSource,
+      description: AUTO_REFLECTION_DESCRIPTION,
+      systemPrompt: cachedAgent?.system ?? undefined,
+      recompileByConversation: runtime.listener.systemPromptRecompileByConversation,
+      recompileQueuedByConversation: runtime.listener.queuedSystemPromptRecompileByConversation,
+      onCompletionMessage: async (completionMessage) => {
+        const notificationXml = `<task-notification><summary>${escapeTaskNotificationSummary(completionMessage)}</summary></task-notification>`;
+        emitCanonicalMessageDelta(socket, runtime, {
+          type: "message",
+          id: `user-msg-${crypto.randomUUID()}`,
+          date: new Date().toISOString(),
+          message_type: "user_message",
+          content: [{ type: "text", text: notificationXml }]
+        }, {
+          agent_id: agentId,
+          conversation_id: conversationId
+        });
       }
-      const memoryDir = getMemoryFilesystemRoot(agentId);
-      const parentMemory = await buildParentMemorySnapshot(memoryDir);
-      const reflectionPrompt = buildReflectionSubagentPrompt({
-        memoryDir,
-        parentMemory
-      });
-      const { spawnBackgroundSubagentTask: spawnBackgroundSubagentTask2, waitForBackgroundSubagentAgentId: waitForBackgroundSubagentAgentId2 } = await Promise.resolve().then(() => (init_task(), exports_task));
-      const { subagentId } = spawnBackgroundSubagentTask2({
-        subagentType: "reflection",
-        prompt: reflectionPrompt,
-        description: AUTO_REFLECTION_DESCRIPTION,
-        silentCompletion: true,
-        transcriptPath: autoPayload.payloadPath,
-        parentScope: { agentId, conversationId },
-        onComplete: async ({ success: success2, error: error54, agentId: reflectionAgentId2 }) => {
-          telemetry.trackReflectionEnd(triggerSource, success2, {
-            subagentId: reflectionAgentId2 ?? undefined,
-            conversationId,
-            error: error54
-          });
-          await finalizeAutoReflectionPayload(agentId, conversationId, autoPayload.payloadPath, autoPayload.endSnapshotLine, success2);
-          const completionMessage = await handleMemorySubagentCompletion({
-            agentId,
-            conversationId,
-            subagentType: "reflection",
-            success: success2,
-            error: error54
-          }, {
-            recompileByConversation: runtime.listener.systemPromptRecompileByConversation,
-            recompileQueuedByConversation: runtime.listener.queuedSystemPromptRecompileByConversation,
-            logRecompileFailure: (message) => debugWarn("memory", message)
-          });
-          const notificationXml = `<task-notification><summary>${escapeTaskNotificationSummary(completionMessage)}</summary></task-notification>`;
-          emitCanonicalMessageDelta(socket, runtime, {
-            type: "message",
-            id: `user-msg-${crypto.randomUUID()}`,
-            date: new Date().toISOString(),
-            message_type: "user_message",
-            content: [{ type: "text", text: notificationXml }]
-          }, {
-            agent_id: agentId,
-            conversation_id: conversationId
-          });
-        }
-      });
-      const reflectionAgentId = await waitForBackgroundSubagentAgentId2(subagentId, 1000);
-      telemetry.trackReflectionStart(triggerSource, {
-        subagentId: reflectionAgentId ?? undefined,
-        conversationId,
-        startMessageId: autoPayload.startMessageId,
-        endMessageId: autoPayload.endMessageId
-      });
-      debugLog("memory", `Auto-launched reflection subagent (${triggerSource})`);
-      return true;
-    } catch (error54) {
-      debugWarn("memory", `Failed to auto-launch reflection subagent (${triggerSource}): ${error54 instanceof Error ? error54.message : String(error54)}`);
-      return false;
-    }
+    });
+    return result.launched;
   };
 }
 async function maybeLaunchPostTurnChannelReflection(params) {
@@ -260924,7 +261093,6 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
             socket,
             agentId,
             conversationId,
-            workingDirectory: turnWorkingDirectory,
             cachedAgent
           }) : undefined,
           workingDirectory: turnWorkingDirectory
@@ -261089,7 +261257,6 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
               socket,
               agentId: agentId || "",
               conversationId,
-              workingDirectory: turnWorkingDirectory,
               cachedAgent
             })
           });
@@ -261427,19 +261594,16 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
     evictConversationRuntimeIfIdle(runtime);
   }
 }
-var AUTO_REFLECTION_DESCRIPTION = "Reflect on recent conversations";
 var init_turn = __esm(async () => {
   init_approval_recovery();
   init_check_approval();
   init_context();
   init_conversation_description();
-  init_memory_filesystem2();
-  init_subagent_state();
   init_turn_recovery_policy();
   init_backend2();
   init_error_formatter();
   init_memory_reminder();
-  init_memory_subagent_completion();
+  init_reflection_launcher();
   init_reflection_transcript();
   init_engine3();
   init_settings_manager();
@@ -261775,23 +261939,6 @@ var init_control_inputs = __esm(async () => {
   ]);
 });
 
-// src/cli/helpers/reflection-gate.ts
-function isReflectionSubagentActive(subagents, agentId, conversationId) {
-  return subagents.some((agent2) => {
-    if (agent2.type.toLowerCase() !== "reflection") {
-      return false;
-    }
-    if (agent2.status !== "pending" && agent2.status !== "running") {
-      return false;
-    }
-    if (!agent2.parentAgentId) {
-      return false;
-    }
-    const parentConversationId = agent2.parentConversationId ?? "default";
-    return agent2.parentAgentId === agentId && parentConversationId === conversationId;
-  });
-}
-
 // src/websocket/terminal-handler.ts
 import * as os4 from "node:os";
 import WebSocket5 from "ws";
@@ -263848,95 +263995,58 @@ async function wireChannelIngress(listener, socket, opts, processQueuedTurn) {
   registry2.setReflectionHandler(async ({ runtime }) => {
     const agentId = runtime.agent_id;
     const conversationId = runtime.conversation_id;
-    if (!settingsManager.isMemfsEnabled(agentId)) {
-      return {
-        handled: true,
-        text: "Reflection needs the memory filesystem to be enabled for this agent. Use /remember for a lightweight memory update instead."
-      };
-    }
-    if (isReflectionSubagentActive(getSubagents(), agentId, conversationId)) {
-      return {
-        handled: true,
-        text: "A reflection agent is already running for this conversation."
-      };
-    }
-    try {
-      let systemPrompt;
-      try {
-        const agent2 = await getBackend().retrieveAgent(agentId);
-        systemPrompt = agent2.system ?? undefined;
-      } catch {}
-      const autoPayload = await buildAutoReflectionPayload(agentId, conversationId, systemPrompt);
-      if (!autoPayload) {
+    const result = await launchReflectionSubagent({
+      agentId,
+      conversationId,
+      memfsEnabled: settingsManager.isMemfsEnabled(agentId),
+      triggerSource: "manual",
+      description: "Reflecting on channel conversation",
+      recompileByConversation: listener.systemPromptRecompileByConversation,
+      recompileQueuedByConversation: listener.queuedSystemPromptRecompileByConversation,
+      onCompletionMessage: async (completionMessage) => {
+        const conversationRuntime = getOrCreateConversationRuntime(listener, agentId, conversationId);
+        const notificationXml = `<task-notification><summary>${escapeTaskNotificationSummary2(completionMessage)}</summary></task-notification>`;
+        emitStreamDelta(socket, conversationRuntime, {
+          type: "message",
+          id: `user-msg-${crypto.randomUUID()}`,
+          date: new Date().toISOString(),
+          message_type: "user_message",
+          content: [{ type: "text", text: notificationXml }]
+        }, {
+          agent_id: agentId,
+          conversation_id: conversationId
+        });
+      }
+    });
+    if (!result.launched) {
+      if (result.reason === "memfs_disabled") {
+        return {
+          handled: true,
+          text: "Reflection needs the memory filesystem to be enabled for this agent. Use /remember for a lightweight memory update instead."
+        };
+      }
+      if (result.reason === "already_active") {
+        return {
+          handled: true,
+          text: "A reflection agent is already running for this conversation."
+        };
+      }
+      if (result.reason === "no_payload") {
         return {
           handled: true,
           text: "No new transcript content to reflect on for this conversation."
         };
       }
-      const memoryDir = getMemoryFilesystemRoot(agentId);
-      const parentMemory = await buildParentMemorySnapshot(memoryDir);
-      const reflectionPrompt = buildReflectionSubagentPrompt({
-        memoryDir,
-        parentMemory
-      });
-      const { spawnBackgroundSubagentTask: spawnBackgroundSubagentTask2, waitForBackgroundSubagentAgentId: waitForBackgroundSubagentAgentId2 } = await Promise.resolve().then(() => (init_task(), exports_task));
-      const { subagentId } = spawnBackgroundSubagentTask2({
-        subagentType: "reflection",
-        prompt: reflectionPrompt,
-        description: "Reflecting on channel conversation",
-        silentCompletion: true,
-        transcriptPath: autoPayload.payloadPath,
-        parentScope: { agentId, conversationId },
-        onComplete: async ({ success: success2, error: error54, agentId: reflectionAgentId2 }) => {
-          telemetry.trackReflectionEnd("manual", success2, {
-            subagentId: reflectionAgentId2 ?? undefined,
-            conversationId,
-            error: error54
-          });
-          await finalizeAutoReflectionPayload(agentId, conversationId, autoPayload.payloadPath, autoPayload.endSnapshotLine, success2);
-          const completionMessage = await handleMemorySubagentCompletion({
-            agentId,
-            conversationId,
-            subagentType: "reflection",
-            success: success2,
-            error: error54
-          }, {
-            recompileByConversation: listener.systemPromptRecompileByConversation,
-            recompileQueuedByConversation: listener.queuedSystemPromptRecompileByConversation,
-            logRecompileFailure: (message) => isDebugEnabled() && console.warn(message)
-          });
-          const conversationRuntime = getOrCreateConversationRuntime(listener, agentId, conversationId);
-          const notificationXml = `<task-notification><summary>${escapeTaskNotificationSummary2(completionMessage)}</summary></task-notification>`;
-          emitStreamDelta(socket, conversationRuntime, {
-            type: "message",
-            id: `user-msg-${crypto.randomUUID()}`,
-            date: new Date().toISOString(),
-            message_type: "user_message",
-            content: [{ type: "text", text: notificationXml }]
-          }, {
-            agent_id: agentId,
-            conversation_id: conversationId
-          });
-        }
-      });
-      const reflectionAgentId = await waitForBackgroundSubagentAgentId2(subagentId, 1000);
-      telemetry.trackReflectionStart("manual", {
-        subagentId: reflectionAgentId ?? undefined,
-        conversationId,
-        startMessageId: autoPayload.startMessageId,
-        endMessageId: autoPayload.endMessageId
-      });
-      return {
-        handled: true,
-        text: "Started a reflection pass for this conversation."
-      };
-    } catch (error54) {
-      const message = error54 instanceof Error ? error54.message : String(error54);
+      const message = result.error instanceof Error ? result.error.message : String(result.error ?? "Unknown error");
       return {
         handled: true,
         text: `Failed to start reflection: ${message}`
       };
     }
+    return {
+      handled: true,
+      text: "Started a reflection pass for this conversation."
+    };
   });
   registry2.setReady();
 }
@@ -264400,13 +264510,10 @@ function stopListenerClient() {
   stopRuntime(runtime, true);
 }
 var init_lifecycle = __esm(async () => {
-  init_memory_filesystem2();
   init_subagent_state();
-  init_backend2();
   init_commands();
   init_registry();
-  init_memory_subagent_completion();
-  init_reflection_transcript();
+  init_reflection_launcher();
   init_runtime_context();
   init_settings_manager();
   init_telemetry();
@@ -268618,7 +268725,7 @@ var exports_prompt_assets2 = {};
 __export(exports_prompt_assets2, {
   validateSystemPromptPreset: () => validateSystemPromptPreset2,
   shouldRecommendDefaultPrompt: () => shouldRecommendDefaultPrompt2,
-  resolveSystemPrompt: () => resolveSystemPrompt2,
+  resolveSystemPrompt: () => resolveSystemPrompt3,
   resolveAndBuildSystemPrompt: () => resolveAndBuildSystemPrompt2,
   isKnownPreset: () => isKnownPreset2,
   buildSystemPrompt: () => buildSystemPrompt2,
@@ -268671,9 +268778,9 @@ async function resolveAndBuildSystemPrompt2(promptId, memoryMode) {
   if (isKnownPreset2(id2)) {
     return buildSystemPrompt2(id2, memoryMode);
   }
-  return resolveSystemPrompt2(id2);
+  return resolveSystemPrompt3(id2);
 }
-async function resolveSystemPrompt2(systemPromptPreset) {
+async function resolveSystemPrompt3(systemPromptPreset) {
   if (!systemPromptPreset) {
     return SYSTEM_PROMPT2;
   }
@@ -441608,75 +441715,17 @@ async function runBidirectionalMode(agent2, conversationId, _outputFormat, inclu
   const sharedReminderState = createSharedReminderState();
   const isSubagent = process.env.LETTA_CODE_AGENT_ROLE === "subagent";
   const maybeLaunchReflectionSubagent = async (triggerSource) => {
-    if (!settingsManager.isMemfsEnabled(agent2.id)) {
-      return false;
-    }
-    if (isReflectionSubagentActive(getSubagents(), agent2.id, conversationId)) {
-      debugLog("memory", `Skipping auto reflection launch (${triggerSource}) because one is already active`);
-      return false;
-    }
-    try {
-      let systemPrompt = agent2.system ?? undefined;
-      if (!systemPrompt) {
-        try {
-          const freshAgent = await backend4.retrieveAgent(agent2.id);
-          systemPrompt = freshAgent.system ?? undefined;
-        } catch {
-          debugLog("memory", "Failed to fetch agent system prompt for reflection payload");
-        }
-      }
-      const autoPayload = await buildAutoReflectionPayload(agent2.id, conversationId, systemPrompt);
-      if (!autoPayload) {
-        debugLog("memory", `Skipping auto reflection launch (${triggerSource}) because transcript has no new content`);
-        return false;
-      }
-      const memoryDir = getMemoryFilesystemRoot(agent2.id);
-      const parentMemory = await buildParentMemorySnapshot(memoryDir);
-      const reflectionPrompt = buildReflectionSubagentPrompt({
-        memoryDir,
-        parentMemory
-      });
-      const { spawnBackgroundSubagentTask: spawnBackgroundSubagentTask2, waitForBackgroundSubagentAgentId: waitForBackgroundSubagentAgentId2 } = await Promise.resolve().then(() => (init_task(), exports_task));
-      const { subagentId } = spawnBackgroundSubagentTask2({
-        subagentType: "reflection",
-        prompt: reflectionPrompt,
-        description: AUTO_REFLECTION_DESCRIPTION2,
-        silentCompletion: true,
-        transcriptPath: autoPayload.payloadPath,
-        parentScope: { agentId: agent2.id, conversationId },
-        onComplete: async ({ success: success2, error: error54, agentId: reflectionAgentId2 }) => {
-          telemetry.trackReflectionEnd(triggerSource, success2, {
-            subagentId: reflectionAgentId2 ?? undefined,
-            conversationId,
-            error: error54
-          });
-          await finalizeAutoReflectionPayload(agent2.id, conversationId, autoPayload.payloadPath, autoPayload.endSnapshotLine, success2);
-          await handleMemorySubagentCompletion({
-            agentId: agent2.id,
-            conversationId,
-            subagentType: "reflection",
-            success: success2,
-            error: error54
-          }, {
-            recompileByConversation: systemPromptRecompileByConversation,
-            recompileQueuedByConversation: queuedSystemPromptRecompileByConversation,
-            logRecompileFailure: (message) => debugWarn("memory", message)
-          });
-        }
-      });
-      const reflectionAgentId = await waitForBackgroundSubagentAgentId2(subagentId, 1000);
-      telemetry.trackReflectionStart(triggerSource, {
-        subagentId: reflectionAgentId ?? undefined,
-        conversationId,
-        startMessageId: autoPayload.startMessageId,
-        endMessageId: autoPayload.endMessageId
-      });
-      debugLog("memory", `Auto-launched reflection subagent (${triggerSource})`);
-      return true;
-    } catch (error54) {
-      debugWarn("memory", `Failed to auto-launch reflection subagent (${triggerSource}): ${error54 instanceof Error ? error54.message : String(error54)}`);
-      return false;
-    }
+    const result = await launchReflectionSubagent({
+      agentId: agent2.id,
+      conversationId,
+      memfsEnabled: settingsManager.isMemfsEnabled(agent2.id),
+      triggerSource,
+      description: AUTO_REFLECTION_DESCRIPTION,
+      systemPrompt: agent2.system ?? undefined,
+      recompileByConversation: systemPromptRecompileByConversation,
+      recompileQueuedByConversation: queuedSystemPromptRecompileByConversation
+    });
+    return result.launched;
   };
   const resolveAllPendingApprovals = async () => {
     const { getResumeDataFromBackend: getResumeDataFromBackend3 } = await Promise.resolve().then(() => (init_check_approval(), exports_check_approval));
@@ -442580,7 +442629,7 @@ async function runBidirectionalMode(agent2, conversationId, _outputFormat, inclu
   setMessageQueueAdder(null);
   await exitBidirectional(0, "headless_bidirectional_stdin_closed");
 }
-var LLM_API_ERROR_MAX_RETRIES2 = 3, EMPTY_RESPONSE_MAX_RETRIES2 = 2, PROVIDER_FALLBACK_MAP2, CONVERSATION_BUSY_MAX_RETRIES = 3, AUTO_REFLECTION_DESCRIPTION2 = "Reflect on recent conversations", __headlessTestUtils;
+var LLM_API_ERROR_MAX_RETRIES2 = 3, EMPTY_RESPONSE_MAX_RETRIES2 = 2, PROVIDER_FALLBACK_MAP2, CONVERSATION_BUSY_MAX_RETRIES = 3, __headlessTestUtils;
 var init_headless = __esm(async () => {
   init_error();
   init_telemetry();
@@ -442593,17 +442642,15 @@ var init_headless = __esm(async () => {
   init_create6();
   init_list_messages_handler();
   init_memory3();
-  init_memory_filesystem2();
   init_model();
   init_modify();
   init_personality();
   init_skill_sources();
-  init_subagent_state();
   init_backend2();
   init_paths();
   init_error_formatter();
   init_memory_reminder();
-  init_memory_subagent_completion();
+  init_reflection_launcher();
   init_reflection_transcript();
   init_constants2();
   init_diff_preview();
@@ -444389,13 +444436,6 @@ Location: ${keybindingsPath}`;
         return "Opening GitHub App installer...";
       }
     },
-    "/disconnect": {
-      desc: "Disconnect an existing account (/disconnect codex|claude|zai)",
-      order: 41,
-      handler: () => {
-        return "Disconnecting...";
-      }
-    },
     "/bg": {
       desc: "Show background shell processes",
       order: 42,
@@ -463593,6 +463633,18 @@ function getModelCategories(_billingTier, isSelfHosted, localModelCatalog, recen
   return base3;
 }
 function toSelectorModelForHandle(handle2) {
+  const registryHandle = normalizeModelHandleForRegistry(handle2) ?? handle2;
+  const modelInfo = getModelInfo(registryHandle);
+  if (modelInfo) {
+    return {
+      id: handle2,
+      handle: handle2,
+      registryHandle,
+      label: modelInfo.label,
+      description: modelInfo.description ?? "",
+      updateArgs: modelInfo.updateArgs
+    };
+  }
   return {
     id: handle2,
     handle: handle2,
@@ -463614,6 +463666,7 @@ function filterModelsByAvailabilityForSelector(typedModels, availableHandles, al
 function ModelSelector({
   currentModelId,
   currentModelHandle,
+  currentModelServiceTier,
   onSelect,
   onOpenConnect,
   onOpenLogin,
@@ -463717,9 +463770,42 @@ function ModelSelector({
     })();
   }, [localModelCatalog]);
   const pickPreferredStaticModel = import_react93.useCallback((handle2, contextWindow) => {
-    const staticCandidates = typedModels.filter((m4) => m4.handle === handle2 && (contextWindow === undefined || m4.updateArgs?.context_window === contextWindow));
+    const registryHandle = normalizeModelHandleForRegistry(handle2) ?? handle2;
+    const staticCandidates = typedModels.filter((m4) => m4.handle === registryHandle && (contextWindow === undefined || m4.updateArgs?.context_window === contextWindow));
     return staticCandidates.find((m4) => m4.isDefault) ?? staticCandidates.find((m4) => m4.isFeatured) ?? staticCandidates.find((m4) => m4.updateArgs?.reasoning_effort === "medium") ?? staticCandidates.find((m4) => m4.updateArgs?.reasoning_effort === "high") ?? staticCandidates[0];
   }, [typedModels]);
+  const serviceTierForModel = import_react93.useCallback((model) => {
+    const value = model.updateArgs?.service_tier;
+    return value === CHATGPT_FAST_SERVICE_TIER ? CHATGPT_FAST_SERVICE_TIER : null;
+  }, []);
+  const withActualHandle = import_react93.useCallback((model, handle2, registryHandle, updateArgs) => ({
+    ...model,
+    id: updateArgs?.service_tier === CHATGPT_FAST_SERVICE_TIER ? `${handle2}::service_tier=${CHATGPT_FAST_SERVICE_TIER}` : handle2,
+    handle: handle2,
+    registryHandle: registryHandle ?? model.registryHandle ?? model.handle,
+    updateArgs: updateArgs ?? model.updateArgs
+  }), []);
+  const modelsForBackendHandle = import_react93.useCallback((handle2, includeUnknown) => {
+    const registryHandle = normalizeModelHandleForRegistry(handle2) ?? handle2;
+    const baseStaticModel = pickPreferredStaticModel(registryHandle);
+    const fastRegistryHandle = getChatGptFastRegistryHandleForModelHandle(handle2);
+    const baseUpdateArgs = {
+      ...baseStaticModel?.updateArgs ?? {},
+      ...fastRegistryHandle ? { service_tier: null } : {}
+    };
+    const baseModel = baseStaticModel ? withActualHandle(baseStaticModel, handle2, registryHandle, Object.keys(baseUpdateArgs).length > 0 ? baseUpdateArgs : undefined) : includeUnknown ? toSelectorModelForHandle(handle2) : null;
+    const result = baseModel ? [baseModel] : [];
+    if (fastRegistryHandle) {
+      const fastStaticModel = pickPreferredStaticModel(fastRegistryHandle);
+      if (fastStaticModel) {
+        result.push(withActualHandle(fastStaticModel, handle2, fastRegistryHandle, {
+          ...fastStaticModel.updateArgs ?? {},
+          service_tier: CHATGPT_FAST_SERVICE_TIER
+        }));
+      }
+    }
+    return result;
+  }, [pickPreferredStaticModel, withActualHandle]);
   const supportedModels = import_react93.useMemo(() => {
     if (availableHandles === undefined)
       return [];
@@ -463735,7 +463821,7 @@ function ModelSelector({
     const deduped = [];
     for (const m4 of available) {
       const contextWindow = m4.updateArgs?.context_window;
-      const key2 = `${m4.handle}:${contextWindow ?? 0}`;
+      const key2 = `${m4.handle}:${contextWindow ?? 0}:${serviceTierForModel(m4) ?? "default"}`;
       if (seen.has(key2))
         continue;
       seen.add(key2);
@@ -463750,7 +463836,8 @@ function ModelSelector({
     allApiHandles,
     filterProvider,
     searchQuery,
-    pickPreferredStaticModel
+    pickPreferredStaticModel,
+    serviceTierForModel
   ]);
   const isByokHandle = import_react93.useCallback((handle2) => isByokHandleForSelector(handle2, byokProviderAliases), [byokProviderAliases]);
   const allLettaModels = import_react93.useMemo(() => {
@@ -463839,39 +463926,51 @@ function ModelSelector({
   const serverRecommendedModels = import_react93.useMemo(() => {
     if (!backendModelCatalog || availableHandles === undefined)
       return [];
-    let available = typedModels.filter((m4) => availableHandles?.has(m4.handle) && m4.handle !== "letta/letta-free");
+    let available = allApiHandles.filter((handle2) => handle2 !== "letta/letta-free").flatMap((handle2) => modelsForBackendHandle(handle2, false));
     if (searchQuery) {
       const query2 = searchQuery.toLowerCase();
-      available = available.filter((m4) => m4.label.toLowerCase().includes(query2) || m4.description.toLowerCase().includes(query2) || m4.handle.toLowerCase().includes(query2));
+      available = available.filter((m4) => m4.label.toLowerCase().includes(query2) || m4.description.toLowerCase().includes(query2) || m4.registryHandle?.toLowerCase().includes(query2) || m4.handle.toLowerCase().includes(query2));
     }
     const seen = new Set;
     const deduped = [];
     for (const m4 of available) {
       const contextWindow = m4.updateArgs?.context_window;
-      const key2 = `${m4.handle}:${contextWindow ?? 0}`;
+      const key2 = `${m4.handle}:${contextWindow ?? 0}:${serviceTierForModel(m4) ?? "default"}`;
       if (seen.has(key2))
         continue;
       seen.add(key2);
-      deduped.push(pickPreferredStaticModel(m4.handle, contextWindow) ?? m4);
+      deduped.push(m4);
     }
     return deduped;
   }, [
     backendModelCatalog,
-    typedModels,
     availableHandles,
+    allApiHandles,
     searchQuery,
-    pickPreferredStaticModel
+    modelsForBackendHandle,
+    serviceTierForModel
   ]);
   const serverAllModels = import_react93.useMemo(() => {
     if (!backendModelCatalog)
       return [];
-    let handles = allApiHandles.filter((h3) => h3 !== "letta/letta-free");
+    const handles = allApiHandles.filter((h3) => h3 !== "letta/letta-free");
+    return handles;
+  }, [backendModelCatalog, allApiHandles]);
+  const serverAllModelRows = import_react93.useMemo(() => {
+    if (!backendModelCatalog)
+      return [];
+    let rows = serverAllModels.flatMap((handle2) => modelsForBackendHandle(handle2, true));
     if (searchQuery) {
       const query2 = searchQuery.toLowerCase();
-      handles = handles.filter((h3) => h3.toLowerCase().includes(query2));
+      rows = rows.filter((model) => model.label.toLowerCase().includes(query2) || model.description.toLowerCase().includes(query2) || model.registryHandle?.toLowerCase().includes(query2) || model.handle.toLowerCase().includes(query2));
     }
-    return handles;
-  }, [backendModelCatalog, allApiHandles, searchQuery]);
+    return rows;
+  }, [
+    backendModelCatalog,
+    serverAllModels,
+    modelsForBackendHandle,
+    searchQuery
+  ]);
   const recentModels = import_react93.useMemo(() => {
     if (availableHandles === undefined)
       return [];
@@ -463906,7 +464005,7 @@ function ModelSelector({
       description: ""
     })),
     "server-recommended": serverRecommendedModels,
-    "server-all": serverAllModels.map(toSelectorModelForHandle),
+    "server-all": serverAllModelRows,
     all: allLettaModels
   }), [
     recentModels,
@@ -463915,7 +464014,7 @@ function ModelSelector({
     byokAllModels,
     allLettaModels,
     serverRecommendedModels,
-    serverAllModels
+    serverAllModelRows
   ]);
   const nonEmptyCategories = import_react93.useMemo(() => modelCategories.filter((cat) => {
     const list = categoryListMap[cat];
@@ -464049,7 +464148,14 @@ function ModelSelector({
     } else if (key2.return) {
       const selectedModel = currentList[selectedIndex];
       if (selectedModel) {
-        onSelect(selectedModel.id);
+        onSelect({
+          id: selectedModel.id,
+          handle: selectedModel.handle,
+          label: selectedModel.label,
+          description: selectedModel.description,
+          registryHandle: selectedModel.registryHandle,
+          updateArgs: selectedModel.updateArgs
+        });
       }
     }
   }, { isActive: true });
@@ -464065,7 +464171,7 @@ function ModelSelector({
     if (cat === "server-recommended")
       return `Recommended [${serverRecommendedModels.length}]`;
     if (cat === "server-all")
-      return `All models [${serverAllModels.length}]`;
+      return `All models [${serverAllModelRows.length}]`;
     return `Letta API (all) [${allLettaModels.length}]`;
   };
   const getCategoryDescription = (cat) => {
@@ -464235,7 +464341,9 @@ function ModelSelector({
           visibleModels.map((model, index) => {
             const actualIndex = startIndex + index;
             const isSelected = actualIndex === selectedIndex;
-            const isCurrent = model.id === currentModelId || model.handle === currentModelHandle;
+            const modelServiceTier = serviceTierForModel(model);
+            const currentServiceTier = currentModelServiceTier === CHATGPT_FAST_SERVICE_TIER ? CHATGPT_FAST_SERVICE_TIER : null;
+            const isCurrent = (model.id === currentModelId || model.handle === currentModelHandle) && modelServiceTier === currentServiceTier;
             const showLock = isFreeTier && !model.free && (category === "supported" || category === "all");
             return /* @__PURE__ */ jsx_dev_runtime68.jsxDEV(Box_default, {
               flexDirection: "row",
@@ -464492,6 +464600,20 @@ function filterProviderConfigs(providers, query2) {
     return searchable.includes(normalized);
   });
 }
+function providerSelectionFlow(provider, connectedProviderId) {
+  if (connectedProviderId)
+    return "options";
+  if (provider.isOAuth)
+    return "oauth";
+  if ("authMethods" in provider && provider.authMethods)
+    return "methodSelect";
+  if ("fields" in provider && provider.fields)
+    return "multiInput";
+  return "input";
+}
+function isProviderTargetLoading(input) {
+  return input.connectedProvidersByTarget[input.selectedTarget] === undefined && (input.selectedTarget === "local" || input.showProviderStoreTabs);
+}
 function ProviderSelector({
   onCancel,
   onStartOAuth
@@ -464501,8 +464623,8 @@ function ProviderSelector({
   const [selectedTarget, setSelectedTarget] = import_react96.useState(defaultProviderStorageTarget());
   const [hasConstellationCredentials, setHasConstellationCredentials] = import_react96.useState(null);
   const [selectedIndex, setSelectedIndex] = import_react96.useState(0);
-  const [connectedProviders, setConnectedProviders] = import_react96.useState(new Map);
-  const [isLoading, setIsLoading] = import_react96.useState(true);
+  const [connectedProvidersByTarget, setConnectedProvidersByTarget] = import_react96.useState({});
+  const [loadingTargets, setLoadingTargets] = import_react96.useState(new Set);
   const [viewState, setViewState] = import_react96.useState({ type: "list" });
   const [searchQuery, setSearchQuery] = import_react96.useState("");
   const [apiKeyInput, setApiKeyInput] = import_react96.useState("");
@@ -464518,6 +464640,12 @@ function ProviderSelector({
   const providers = import_react96.useMemo(() => getProviderConfigs(selectedTarget), [selectedTarget]);
   const filteredProviders = import_react96.useMemo(() => filterProviderConfigs(providers, searchQuery), [providers, searchQuery]);
   const showProviderStoreTabs = shouldShowProviderStoreTabs(hasConstellationCredentials);
+  const connectedProviders = import_react96.useMemo(() => connectedProvidersByTarget[selectedTarget] ?? new Map, [connectedProvidersByTarget, selectedTarget]);
+  const isLoading = isProviderTargetLoading({
+    selectedTarget,
+    connectedProvidersByTarget,
+    showProviderStoreTabs
+  });
   const selectableProviders = filteredProviders;
   const providerStartIndex = import_react96.useMemo(() => {
     if (selectedIndex < VISIBLE_PROVIDERS)
@@ -464548,28 +464676,67 @@ function ProviderSelector({
       cancelled = true;
     };
   }, []);
+  const setConnectedProvidersForTarget = import_react96.useCallback((target2, providers2) => {
+    setConnectedProvidersByTarget((previous) => ({
+      ...previous,
+      [target2]: providers2
+    }));
+  }, []);
+  const refreshConnectedProviders = import_react96.useCallback(async (target2) => {
+    setLoadingTargets((previous) => new Set(previous).add(target2));
+    try {
+      const providers2 = await getConnectedProviders({ target: target2 });
+      if (mountedRef.current) {
+        setConnectedProvidersForTarget(target2, providers2);
+      }
+    } catch {
+      if (mountedRef.current) {
+        setConnectedProvidersForTarget(target2, new Map);
+      }
+    } finally {
+      if (mountedRef.current) {
+        setLoadingTargets((previous) => {
+          const next = new Set(previous);
+          next.delete(target2);
+          return next;
+        });
+      }
+    }
+  }, [setConnectedProvidersForTarget]);
   import_react96.useEffect(() => {
-    if (selectedTarget === "api" && !showProviderStoreTabs) {
-      setIsLoading(false);
+    if (selectedTarget === "api" && !showProviderStoreTabs)
+      return;
+    if (connectedProvidersByTarget[selectedTarget])
+      return;
+    if (loadingTargets.has(selectedTarget))
+      return;
+    refreshConnectedProviders(selectedTarget);
+  }, [
+    connectedProvidersByTarget,
+    loadingTargets,
+    refreshConnectedProviders,
+    selectedTarget,
+    showProviderStoreTabs
+  ]);
+  import_react96.useEffect(() => {
+    if (!showProviderStoreTabs)
       return;
+    for (const target2 of ["local", "api"]) {
+      if (target2 === selectedTarget)
+        continue;
+      if (connectedProvidersByTarget[target2])
+        continue;
+      if (loadingTargets.has(target2))
+        continue;
+      refreshConnectedProviders(target2);
     }
-    setIsLoading(true);
-    (async () => {
-      try {
-        const providers2 = await getConnectedProviders({
-          target: selectedTarget
-        });
-        if (mountedRef.current) {
-          setConnectedProviders(providers2);
-          setIsLoading(false);
-        }
-      } catch {
-        if (mountedRef.current) {
-          setIsLoading(false);
-        }
-      }
-    })();
-  }, [selectedTarget, showProviderStoreTabs]);
+  }, [
+    connectedProvidersByTarget,
+    loadingTargets,
+    refreshConnectedProviders,
+    selectedTarget,
+    showProviderStoreTabs
+  ]);
   import_react96.useEffect(() => {
     if (!showProviderStoreTabs && selectedTarget !== "local") {
       setSelectedTarget("local");
@@ -464627,23 +464794,23 @@ function ProviderSelector({
     return providerName ? connectedProviders.get(providerName)?.id : undefined;
   }, [connectedProviders, getConnectedProviderName]);
   const handleSelectProvider = import_react96.useCallback((provider) => {
-    if ("isOAuth" in provider && provider.isOAuth) {
+    const providerId2 = getProviderId(provider);
+    const flow = providerSelectionFlow(provider, providerId2);
+    if (flow === "options") {
+      setViewState({ type: "options", provider });
+      setOptionIndex(0);
+      return;
+    }
+    if (flow === "oauth") {
       if (onStartOAuth) {
         onStartOAuth(provider, selectedTarget);
       }
       return;
     }
-    const connected = isConnected(provider);
-    if (connected) {
-      const providerId2 = getProviderId(provider);
-      if (providerId2) {
-        setViewState({ type: "options", provider, providerId: providerId2 });
-        setOptionIndex(0);
-      }
-    } else if ("authMethods" in provider && provider.authMethods) {
+    if (flow === "methodSelect") {
       setViewState({ type: "methodSelect", provider });
       setMethodIndex(0);
-    } else if ("fields" in provider && provider.fields) {
+    } else if (flow === "multiInput") {
       setViewState({ type: "multiInput", provider });
       setFieldValues({});
       setFocusedFieldIndex(0);
@@ -464655,7 +464822,7 @@ function ProviderSelector({
       setValidationState("idle");
       setValidationError(null);
     }
-  }, [isConnected, getProviderId, onStartOAuth, selectedTarget]);
+  }, [getProviderId, onStartOAuth, selectedTarget]);
   const handleSelectAuthMethod = import_react96.useCallback(async (provider, authMethod) => {
     if (authMethod.id === "profile") {
       setIsLoadingProfiles(true);
@@ -464711,7 +464878,7 @@ function ProviderSelector({
           target: selectedTarget
         });
         if (mountedRef.current) {
-          setConnectedProviders(providers2);
+          setConnectedProvidersForTarget(selectedTarget, providers2);
           setViewState({ type: "list" });
           setApiKeyInput("");
           setValidationState("idle");
@@ -464737,7 +464904,13 @@ function ProviderSelector({
         setValidationError(err instanceof Error ? err.message : "Invalid API key");
       }
     }
-  }, [viewState, apiKeyInput, validationState, selectedTarget]);
+  }, [
+    viewState,
+    apiKeyInput,
+    validationState,
+    selectedTarget,
+    setConnectedProvidersForTarget
+  ]);
   const handleMultiFieldValidateAndSave = import_react96.useCallback(async () => {
     if (viewState.type !== "multiInput")
       return;
@@ -464762,7 +464935,7 @@ function ProviderSelector({
           target: selectedTarget
         });
         if (mountedRef.current) {
-          setConnectedProviders(providers2);
+          setConnectedProvidersForTarget(selectedTarget, providers2);
           setViewState({ type: "list" });
           setFieldValues({});
           setValidationState("idle");
@@ -464788,7 +464961,13 @@ function ProviderSelector({
         setValidationError(err instanceof Error ? err.message : "Invalid credentials");
       }
     }
-  }, [viewState, fieldValues, validationState, selectedTarget]);
+  }, [
+    viewState,
+    fieldValues,
+    validationState,
+    selectedTarget,
+    setConnectedProvidersForTarget
+  ]);
   const handleDisconnect = import_react96.useCallback(async () => {
     if (viewState.type !== "options")
       return;
@@ -464797,13 +464976,19 @@ function ProviderSelector({
       await removeProviderByName2(getConnectedProviderName(provider) ?? provider.providerName, {
         target: selectedTarget
       });
+      clearAvailableModelsCache();
       const providers2 = await getConnectedProviders({ target: selectedTarget });
       if (mountedRef.current) {
-        setConnectedProviders(providers2);
+        setConnectedProvidersForTarget(selectedTarget, providers2);
         setViewState({ type: "list" });
       }
     } catch {}
-  }, [viewState, selectedTarget, getConnectedProviderName]);
+  }, [
+    viewState,
+    selectedTarget,
+    getConnectedProviderName,
+    setConnectedProvidersForTarget
+  ]);
   use_input_default((input, key2) => {
     if (key2.ctrl && input === "c") {
       onCancel();
@@ -465440,40 +465625,53 @@ function ProviderSelector({
     if (viewState.type !== "options")
       return null;
     const { provider } = viewState;
-    const options3 = ["Disconnect", "Back"];
+    const options3 = ["Disconnect provider", "Back"];
     return /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(jsx_dev_runtime71.Fragment, {
       children: [
         /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Box_default, {
           flexDirection: "column",
           marginBottom: 1,
-          children: /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Box_default, {
-            flexDirection: "row",
-            children: [
-              /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
-                children: "  "
-              }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
-                color: "green",
-                children: "[✓]"
-              }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
-                children: " "
-              }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
-                bold: true,
-                children: provider.displayName
-              }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
-                dimColor: true,
-                children: " · "
-              }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
-                color: "green",
-                children: "Connected"
-              }, undefined, false, undefined, this)
-            ]
-          }, undefined, true, undefined, this)
-        }, undefined, false, undefined, this),
+          children: [
+            /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
+              bold: true,
+              color: colors.selector.title,
+              children: [
+                "Disconnect ",
+                provider.displayName
+              ]
+            }, undefined, true, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Box_default, {
+              height: 1
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Box_default, {
+              flexDirection: "row",
+              children: [
+                /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
+                  children: "  "
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
+                  color: "green",
+                  children: "[✓]"
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
+                  children: " "
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
+                  bold: true,
+                  children: provider.displayName
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
+                  dimColor: true,
+                  children: " · "
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Text2, {
+                  color: "green",
+                  children: "Connected"
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this)
+          ]
+        }, undefined, true, undefined, this),
         /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(Box_default, {
           flexDirection: "column",
           children: options3.map((option2, index) => {
@@ -465500,7 +465698,7 @@ function ProviderSelector({
             dimColor: true,
             children: [
               "  ",
-              "Enter select · ↑↓ navigate · Esc back"
+              "Enter confirm · ↑↓ navigate · Esc back"
             ]
           }, undefined, true, undefined, this)
         }, undefined, false, undefined, this)
@@ -470190,7 +470388,6 @@ var init_StaticTranscript = __esm(async () => {
 var exports_connect = {};
 __export(exports_connect, {
   setActiveCommandId: () => setActiveCommandId,
-  handleDisconnect: () => handleDisconnect,
   handleConnect: () => handleConnect
 });
 function uid2(prefix) {
@@ -470435,7 +470632,7 @@ async function handleConnectChatGPT(ctx, msg) {
   if (existingProvider) {
     addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, `Already connected to ChatGPT via OAuth.
 
-Use /disconnect chatgpt (or /disconnect codex) to remove the current connection first.`, false);
+Open /connect and select ChatGPT / Codex plan in the current tab to disconnect or re-authenticate.`, false);
     return;
   }
   ctx.setCommandRunning(true);
@@ -470468,7 +470665,9 @@ Use /disconnect chatgpt (or /disconnect codex) to remove the current connection
 async function handleConnectLocalOAuthProvider(ctx, msg, provider) {
   const existingProvider = await getProviderByName2(provider.byokProvider.providerName, { target: "local" });
   if (existingProvider?.auth_type === "oauth") {
-    addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, `Already connected to ${provider.byokProvider.displayName}. Disconnect first if you want to re-authenticate.`, false);
+    addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, `Already connected to ${provider.byokProvider.displayName}.
+
+Open /connect and select it in the Local tab to disconnect or re-authenticate.`, false);
     return;
   }
   ctx.setCommandRunning(true);
@@ -470603,126 +470802,6 @@ ${formatApiKeyUsage(provider)}`, false);
     });
   }
 }
-function formatDisconnectHelp() {
-  return [
-    "/disconnect help",
-    "",
-    "Disconnect an existing account.",
-    "",
-    "USAGE",
-    "  /disconnect <provider>   — disconnect a provider",
-    "  /disconnect help         — show this help",
-    "",
-    "PROVIDERS",
-    `  ${listConnectProvidersForHelp().join(", ")}, claude (legacy)`
-  ].join(`
-`);
-}
-async function handleDisconnectChatGPT(ctx, msg) {
-  const existingProvider = await getOpenAICodexProvider({
-    target: ctx.target
-  });
-  if (!existingProvider) {
-    addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, `Not currently connected to ChatGPT via OAuth.
-
-Use /connect chatgpt (or /connect codex) to authenticate.`, false);
-    return;
-  }
-  const cmdId = addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, "Disconnecting from ChatGPT OAuth...", true, "running");
-  ctx.setCommandRunning(true);
-  try {
-    await removeOpenAICodexProvider({ target: ctx.target });
-    updateCommandResult(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✓ Disconnected from ChatGPT OAuth.
-
-` + `Provider '${OPENAI_CODEX_PROVIDER_NAME}' removed from ${providerStorageTargetLabel(ctx.target)}.`, true, "finished");
-  } catch (error54) {
-    updateCommandResult(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✗ Failed to disconnect from ChatGPT: ${getErrorMessage2(error54)}`, false, "finished");
-  } finally {
-    ctx.setCommandRunning(false);
-  }
-}
-async function handleDisconnectByokProvider(ctx, msg, provider) {
-  const existing = await getProviderByName2(provider.byokProvider.providerName, {
-    target: provider.target
-  });
-  const authMatches = provider.target !== "local" || !existing?.auth_type ? true : provider.byokProvider.isOAuth ? existing.auth_type === "oauth" : existing.auth_type !== "oauth";
-  if (!existing || !authMatches) {
-    addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, `Not currently connected to ${provider.byokProvider.displayName}.
-
-Use /connect ${provider.canonical} to connect.`, false);
-    return;
-  }
-  const cmdId = addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, `Disconnecting from ${provider.byokProvider.displayName}...`, true, "running");
-  ctx.setCommandRunning(true);
-  try {
-    await removeProviderByName2(provider.byokProvider.providerName, {
-      target: provider.target
-    });
-    updateCommandResult(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✓ Disconnected from ${provider.byokProvider.displayName}.
-
-` + `Provider '${provider.byokProvider.providerName}' removed from ${providerStorageTargetLabel(provider.target)}.`, true, "finished");
-  } catch (error54) {
-    updateCommandResult(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✗ Failed to disconnect from ${provider.byokProvider.displayName}: ${getErrorMessage2(error54)}`, false, "finished");
-  } finally {
-    ctx.setCommandRunning(false);
-  }
-}
-async function handleDisconnectClaude(ctx, msg) {
-  const CLAUDE_PROVIDER_NAME = "claude-pro-max";
-  const cmdId = addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, "Checking for Claude provider...", true, "running");
-  ctx.setCommandRunning(true);
-  try {
-    const providers = await listProviders2({ target: ctx.target });
-    const claudeProvider = providers.find((provider) => provider.name === CLAUDE_PROVIDER_NAME);
-    if (!claudeProvider) {
-      updateCommandResult(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `No Claude provider found.
-
-The '${CLAUDE_PROVIDER_NAME}' provider does not exist in your Letta account.`, false, "finished");
-      return;
-    }
-    updateCommandResult(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, "Removing Claude provider...", true, "running");
-    await deleteOpenAICodexProvider(claudeProvider.id, { target: ctx.target });
-    updateCommandResult(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✓ Disconnected from Claude.
-
-` + `Provider '${CLAUDE_PROVIDER_NAME}' has been removed from Letta.
-
-` + "Note: /connect claude has been replaced by /connect chatgpt (alias: /connect codex).", true, "finished");
-  } catch (error54) {
-    updateCommandResult(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `✗ Failed to disconnect from Claude: ${getErrorMessage2(error54)}`, false, "finished");
-  } finally {
-    ctx.setCommandRunning(false);
-  }
-}
-async function handleDisconnect(ctx, msg) {
-  const parts = parseArgs11(msg);
-  const providerToken = parts[1]?.toLowerCase();
-  if (providerToken === "help") {
-    addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, formatDisconnectHelp(), true);
-    return;
-  }
-  if (!providerToken) {
-    addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, "Usage: /disconnect <provider>", false);
-    return;
-  }
-  if (providerToken === "claude") {
-    await handleDisconnectClaude(ctx, msg);
-    return;
-  }
-  const provider = resolveConnectProvider(providerToken, ctx.target);
-  if (!provider) {
-    addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, `Unknown provider: "${providerToken}". Run /disconnect help for usage.`, false);
-    return;
-  }
-  if (isConnectOAuthProvider(provider)) {
-    if (provider.target === "local") {
-      await handleDisconnectByokProvider(ctx, msg, provider);
-    } else {
-      await handleDisconnectChatGPT(ctx, msg);
-    }
-    return;
-  }
-  await handleDisconnectByokProvider(ctx, msg, provider);
-}
 var activeCommandId = null;
 var init_connect = __esm(() => {
   init_local_provider_timeout();
@@ -485351,6 +485430,7 @@ function AppView(props) {
     currentModelDisplay,
     currentModelHandle,
     currentModelId,
+    currentModelServiceTier,
     currentModelProvider,
     isLocalBackend,
     currentPersonalityId,
@@ -485652,7 +485732,7 @@ function AppView(props) {
                 initialEffort: modelReasoningPrompt.initialEffort,
                 onSelect: (selectedOption) => {
                   setModelReasoningPrompt(null);
-                  handleModelSelect(selectedOption.modelId, null, {
+                  handleModelSelect(selectedOption.selection ?? selectedOption.modelId, null, {
                     skipReasoningPrompt: true,
                     reasoningEffort: selectedOption.effort
                   });
@@ -485661,8 +485741,9 @@ function AppView(props) {
               }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime94.jsxDEV(ModelSelector, {
                 currentModelId: currentModelId ?? undefined,
                 currentModelHandle,
-                onSelect: (modelId) => {
-                  handleModelSelect(modelId, null, {
+                currentModelServiceTier,
+                onSelect: (selection) => {
+                  handleModelSelect(selection, null, {
                     promptReasoning: true
                   });
                 },
@@ -486338,7 +486419,7 @@ var init_AppView = __esm(async () => {
 });
 
 // src/cli/app/constants.ts
-var CLEAR_SCREEN_AND_HOME = "\x1B[2J\x1B[H", MIN_RESIZE_DELTA = 2, RESIZE_SETTLE_MS = 250, MIN_CLEAR_INTERVAL_MS = 750, STABLE_WIDTH_SETTLE_MS = 180, TOOL_CALL_COMMIT_DEFER_MS = 50, ANIMATION_RESUME_HYSTERESIS_ROWS = 2, EAGER_CANCEL = true, LLM_API_ERROR_MAX_RETRIES3 = 3, EMPTY_RESPONSE_MAX_RETRIES3 = 2, TEMP_QUOTA_OVERRIDE_MODEL = "letta/auto", PROVIDER_FALLBACK_MAP3, CONVERSATION_BUSY_MAX_RETRIES2 = 3, INTERRUPT_MESSAGE = "Interrupted – tell the agent what to do differently. Something went wrong? Use /feedback to report issues.", ERROR_FEEDBACK_HINT = "Something went wrong? Use /feedback to report issues.", PROVIDER_STATUS_PAGES, APPROVAL_OPTIONS_HEIGHT = 8, APPROVAL_PREVIEW_BUFFER = 4, MIN_WRAP_WIDTH = 10, TEXT_WRAP_GUTTER = 6, DIFF_WRAP_GUTTER = 12, SHELL_PREVIEW_MAX_LINES = 3, AUTO_REFLECTION_DESCRIPTION3 = "Reflect on recent conversations";
+var CLEAR_SCREEN_AND_HOME = "\x1B[2J\x1B[H", MIN_RESIZE_DELTA = 2, RESIZE_SETTLE_MS = 250, MIN_CLEAR_INTERVAL_MS = 750, STABLE_WIDTH_SETTLE_MS = 180, TOOL_CALL_COMMIT_DEFER_MS = 50, ANIMATION_RESUME_HYSTERESIS_ROWS = 2, EAGER_CANCEL = true, LLM_API_ERROR_MAX_RETRIES3 = 3, EMPTY_RESPONSE_MAX_RETRIES3 = 2, TEMP_QUOTA_OVERRIDE_MODEL = "letta/auto", PROVIDER_FALLBACK_MAP3, CONVERSATION_BUSY_MAX_RETRIES2 = 3, INTERRUPT_MESSAGE = "Interrupted – tell the agent what to do differently. Something went wrong? Use /feedback to report issues.", ERROR_FEEDBACK_HINT = "Something went wrong? Use /feedback to report issues.", PROVIDER_STATUS_PAGES, APPROVAL_OPTIONS_HEIGHT = 8, APPROVAL_PREVIEW_BUFFER = 4, MIN_WRAP_WIDTH = 10, TEXT_WRAP_GUTTER = 6, DIFF_WRAP_GUTTER = 12, SHELL_PREVIEW_MAX_LINES = 3;
 var init_constants7 = __esm(() => {
   PROVIDER_FALLBACK_MAP3 = {
     "opus-4.7-low": "bedrock-opus-4.7",
@@ -486413,12 +486494,13 @@ function estimateAdvancedDiffLines(diff3, width) {
 // src/cli/app/model-config.ts
 function deriveReasoningEffort(modelSettings, llmConfig) {
   if (modelSettings && "provider_type" in modelSettings) {
-    if (modelSettings.provider_type === "openai" && "reasoning" in modelSettings && modelSettings.reasoning) {
+    const providerType = modelSettings.provider_type;
+    if ((providerType === "openai" || providerType === "openai-codex" || providerType === "chatgpt_oauth") && "reasoning" in modelSettings && modelSettings.reasoning) {
       const re4 = modelSettings.reasoning.reasoning_effort;
       if (re4 === "none" || re4 === "minimal" || re4 === "low" || re4 === "medium" || re4 === "high" || re4 === "xhigh")
         return re4;
     }
-    if (modelSettings.provider_type === "anthropic" || modelSettings.provider_type === "bedrock") {
+    if (providerType === "anthropic" || providerType === "bedrock") {
       const effort = modelSettings.effort;
       if (effort === "low" || effort === "medium" || effort === "high")
         return effort;
@@ -486465,7 +486547,7 @@ function mapHandleToLlmConfigPatch(modelHandle) {
       model: modelHandle
     };
   }
-  const endpointType = provider === OPENAI_CODEX_PROVIDER_NAME ? "chatgpt_oauth" : provider;
+  const endpointType = provider === OPENAI_CODEX_PROVIDER_NAME || provider === "openai-codex" ? "chatgpt_oauth" : provider;
   return {
     model: modelName,
     model_endpoint_type: endpointType
@@ -487534,12 +487616,6 @@ function formatReflectionSettings(settings3) {
   }
   return `Step count (every ${settings3.stepCount} turns)`;
 }
-function hasActiveReflectionSubagent2(agentId, conversationId) {
-  return isReflectionSubagentActive(getSubagents(), agentId, conversationId);
-}
-var init_reflection2 = __esm(() => {
-  init_subagent_state();
-});
 
 // src/cli/app/use-configuration-handlers.ts
 function useConfigurationHandlers(ctx) {
@@ -487578,7 +487654,9 @@ function useConfigurationHandlers(ctx) {
     setTempModelOverride,
     withCommandLock
   } = ctx;
-  const handleModelSelect = import_react114.useCallback(async (modelId, commandId, opts) => {
+  const handleModelSelect = import_react114.useCallback(async (model, commandId, opts) => {
+    const inputSelection = typeof model === "string" ? null : model;
+    const modelId = typeof model === "string" ? model : model.id;
     let overlayCommand = commandId ? commandRunner.getHandle(commandId, "/model") : null;
     const resolveOverlayCommand = () => {
       if (overlayCommand) {
@@ -487589,19 +487667,39 @@ function useConfigurationHandlers(ctx) {
     };
     let selectedModel = null;
     try {
-      const { getReasoningTierOptionsForHandle: getReasoningTierOptionsForHandle3, models: models4 } = await Promise.resolve().then(() => (init_model(), exports_model));
+      const {
+        getChatGptFastRegistryHandleForModelHandle: getChatGptFastRegistryHandleForModelHandle3,
+        getReasoningTierOptionsForHandle: getReasoningTierOptionsForHandle3,
+        normalizeModelHandleForRegistry: normalizeModelHandleForRegistry3,
+        models: models4
+      } = await Promise.resolve().then(() => (init_model(), exports_model));
       const pickPreferredModelForHandle = (handle2) => {
-        const candidates2 = models4.filter((m4) => m4.handle === handle2);
+        const registryHandle2 = normalizeModelHandleForRegistry3(handle2) ?? handle2;
+        const candidates2 = models4.filter((m4) => m4.handle === registryHandle2);
         return candidates2.find((m4) => m4.isDefault) ?? candidates2.find((m4) => m4.isFeatured) ?? candidates2.find((m4) => m4.updateArgs?.reasoning_effort === "medium") ?? candidates2.find((m4) => m4.updateArgs?.reasoning_effort === "high") ?? candidates2[0] ?? null;
       };
-      selectedModel = models4.find((m4) => m4.id === modelId) ?? null;
+      selectedModel = inputSelection ? {
+        id: inputSelection.id,
+        handle: inputSelection.handle,
+        label: inputSelection.label,
+        description: inputSelection.description,
+        updateArgs: inputSelection.updateArgs,
+        registryHandle: inputSelection.registryHandle
+      } : models4.find((m4) => m4.id === modelId) ?? null;
       if (!selectedModel && modelId.includes("/")) {
         const handleMatch = pickPreferredModelForHandle(modelId);
         if (handleMatch) {
+          const fastRegistryHandle = getChatGptFastRegistryHandleForModelHandle3(modelId);
+          const updateArgs = {
+            ...handleMatch.updateArgs ?? {},
+            ...fastRegistryHandle ? { service_tier: null } : {}
+          };
           selectedModel = {
             ...handleMatch,
             id: modelId,
-            handle: modelId
+            handle: modelId,
+            registryHandle: normalizeModelHandleForRegistry3(modelId) ?? modelId,
+            updateArgs: Object.keys(updateArgs).length > 0 ? updateArgs : undefined
           };
         }
       }
@@ -487635,20 +487733,39 @@ function useConfigurationHandlers(ctx) {
         cmd.fail(output);
         return;
       }
-      const model = selectedModel;
-      const modelHandle = model.handle ?? model.id;
-      const modelUpdateArgs = model.updateArgs;
+      const model2 = selectedModel;
+      const modelHandle = model2.handle ?? model2.id;
+      const registryHandle = model2.registryHandle ?? normalizeModelHandleForRegistry3(modelHandle) ?? modelHandle;
+      const modelUpdateArgs = model2.updateArgs;
       const rawReasoningEffort = modelUpdateArgs?.reasoning_effort;
-      const usesDistinctXHighLabel = model.label.includes("Opus 4.7") || model.label.includes("Opus 4.8");
+      const usesDistinctXHighLabel = model2.label.includes("Opus 4.7") || model2.label.includes("Opus 4.8");
       const reasoningLevel = typeof rawReasoningEffort === "string" ? rawReasoningEffort === "none" ? "no" : rawReasoningEffort === "xhigh" ? usesDistinctXHighLabel ? "extra-high" : "max" : rawReasoningEffort : modelUpdateArgs?.enable_reasoner === false ? "no" : null;
-      const selectedContextWindow = model.updateArgs?.context_window;
-      const reasoningTierOptions = getReasoningTierOptionsForHandle3(modelHandle, selectedContextWindow);
+      const selectedContextWindow = model2.updateArgs?.context_window;
+      const reasoningTierOptions = getReasoningTierOptionsForHandle3(registryHandle, selectedContextWindow).map((option2) => {
+        const optionModel = models4.find((entry) => entry.id === option2.modelId);
+        const serviceTier = modelUpdateArgs?.service_tier;
+        const optionUpdateArgs = {
+          ...optionModel?.updateArgs ?? {},
+          ...serviceTier !== undefined ? { service_tier: serviceTier } : {}
+        };
+        return {
+          ...option2,
+          selection: {
+            id: option2.modelId,
+            handle: modelHandle,
+            label: model2.label,
+            description: model2.description ?? "",
+            registryHandle,
+            updateArgs: optionUpdateArgs
+          }
+        };
+      });
       if (!opts?.skipReasoningPrompt && (opts?.promptReasoning || activeOverlay === "model") && reasoningTierOptions.length > 1) {
-        const selectedEffort = model.updateArgs?.reasoning_effort;
+        const selectedEffort = model2.updateArgs?.reasoning_effort;
         const preferredOption = (typeof selectedEffort === "string" && reasoningTierOptions.find((option2) => option2.effort === selectedEffort)) ?? reasoningTierOptions.find((option2) => option2.effort === "medium") ?? reasoningTierOptions[0];
         if (preferredOption) {
           setModelReasoningPrompt({
-            modelLabel: model.label,
+            modelLabel: model2.label,
             initialModelId: preferredOption.modelId,
             initialEffort: preferredOption.effort,
             options: reasoningTierOptions
@@ -487667,6 +487784,7 @@ function useConfigurationHandlers(ctx) {
         setQueuedOverlayAction({
           type: "switch_model",
           modelId,
+          modelSelection: inputSelection ?? undefined,
           commandId: cmd.id
         });
         return;
@@ -487679,14 +487797,14 @@ function useConfigurationHandlers(ctx) {
         selectedModelHandle: modelHandle,
         selectedContextWindow
       });
-      const modelUpdateArgsForRequest = model.updateArgs ? { ...model.updateArgs } : undefined;
+      const modelUpdateArgsForRequest = model2.updateArgs ? { ...model2.updateArgs } : undefined;
       if (shouldPreserveContextWindow && modelUpdateArgsForRequest) {
         delete modelUpdateArgsForRequest.context_window;
       }
       await withCommandLock(async () => {
-        const cmd = resolveOverlayCommand() ?? commandRunner.start("/model", `Switching model to ${model.label}...`);
+        const cmd = resolveOverlayCommand() ?? commandRunner.start("/model", `Switching model to ${model2.label}...`);
         cmd.update({
-          output: `Switching model to ${model.label}...`,
+          output: `Switching model to ${model2.label}...`,
           phase: "running"
         });
         const isDefaultConversation = conversationIdRef.current === "default";
@@ -487775,7 +487893,7 @@ function useConfigurationHandlers(ctx) {
           toolsetNoticeLine = "Manual toolset override remains active: " + formatToolsetName(persistedToolsetPreference) + ".";
         }
         const outputLines = [
-          "Switched to " + model.label + (reasoningLevel ? ` (${reasoningLevel} reasoning)` : ""),
+          "Switched to " + model2.label + (reasoningLevel ? ` (${reasoningLevel} reasoning)` : ""),
           ...toolsetNoticeLine ? [toolsetNoticeLine] : []
         ].join(`
 `);
@@ -488272,7 +488390,6 @@ var init_use_configuration_handlers = __esm(async () => {
   init_settings_manager();
   init_toolset_labels();
   init_model_config();
-  init_reflection2();
   await init_manager4();
   import_react114 = __toESM(require_react(), 1);
 });
@@ -491007,6 +491124,12 @@ var init_use_queued_approval_submit = __esm(() => {
 function supportsDistinctAnthropicXHighEffort3(modelHandle) {
   return modelHandle.includes("claude-opus-4-7") || modelHandle.includes("claude-opus-4-8");
 }
+function serviceTierForReasoningCycle(modelHandle, modelSettings) {
+  if (!getChatGptFastRegistryHandleForModelHandle(modelHandle)) {
+    return;
+  }
+  return modelSettings?.service_tier === CHATGPT_FAST_SERVICE_TIER ? CHATGPT_FAST_SERVICE_TIER : null;
+}
 function resolveReasoningCycleModelHandle(llmConfig, agentModel) {
   if (agentModel && isLocalModelHandle(agentModel)) {
     return agentModel;
@@ -491028,6 +491151,7 @@ function useReasoningCycle(ctx) {
     agentIdRef,
     agentStateRef,
     commandRunner,
+    conversationOverrideModelSettingsRef,
     conversationIdRef,
     hasConversationModelOverrideRef,
     isAgentBusy,
@@ -491082,12 +491206,14 @@ function useReasoningCycle(ctx) {
           if (isDefaultConversation) {
             const { updateAgentLLMConfig: updateAgentLLMConfig3 } = await Promise.resolve().then(() => (init_modify(), exports_modify));
             updatedAgent = await updateAgentLLMConfig3(agentIdRef.current, desired.modelHandle, {
-              reasoning_effort: desired.effort
+              reasoning_effort: desired.effort,
+              ...desired.serviceTier !== undefined ? { service_tier: desired.serviceTier } : {}
             }, { preserveContextWindow: true });
           } else {
             const { updateConversationLLMConfig: updateConversationLLMConfig2 } = await Promise.resolve().then(() => (init_modify(), exports_modify));
             const updatedConversation = await updateConversationLLMConfig2(conversationIdRef.current, desired.modelHandle, {
-              reasoning_effort: desired.effort
+              reasoning_effort: desired.effort,
+              ...desired.serviceTier !== undefined ? { service_tier: desired.serviceTier } : {}
             }, { preserveContextWindow: true });
             conversationModelSettings2 = updatedConversation.model_settings;
             conversationContextWindowLimit = updatedConversation.context_window_limit;
@@ -491173,7 +491299,7 @@ function useReasoningCycle(ctx) {
       const modelHandle = resolveReasoningCycleModelHandle(current, hasConversationModelOverrideRef.current ? null : agentStateRef.current?.model ?? null);
       if (!modelHandle)
         return;
-      const modelSettingsForEffort = hasConversationModelOverrideRef.current ? undefined : agentStateRef.current?.model_settings;
+      const modelSettingsForEffort = hasConversationModelOverrideRef.current ? conversationOverrideModelSettingsRef.current : agentStateRef.current?.model_settings;
       const currentEffort = deriveReasoningEffort(modelSettingsForEffort, current) ?? "none";
       const { getReasoningTierOptionsForHandle: getReasoningTierOptionsForHandle3 } = await Promise.resolve().then(() => (init_model(), exports_model));
       const tiers = getReasoningTierOptionsForHandle3(modelHandle).map((option2) => ({
@@ -491202,6 +491328,7 @@ function useReasoningCycle(ctx) {
       const next = sorted[nextIndex];
       if (!next)
         return;
+      const serviceTier = serviceTierForReasoningCycle(modelHandle, modelSettingsForEffort);
       if (!reasoningCycleLastConfirmedRef.current) {
         reasoningCycleLastConfirmedRef.current = current ?? null;
         reasoningCycleLastConfirmedAgentStateRef.current = hasConversationModelOverrideRef.current ? null : agentStateRef.current ?? null;
@@ -491215,7 +491342,7 @@ function useReasoningCycle(ctx) {
           const ms = prev.model_settings;
           if (!ms || !("provider_type" in ms))
             return prev;
-          if (ms.provider_type === "openai") {
+          if (ms.provider_type === "openai" || ms.provider_type === "chatgpt_oauth") {
             return {
               ...prev,
               model_settings: {
@@ -491245,7 +491372,8 @@ function useReasoningCycle(ctx) {
       reasoningCycleDesiredRef.current = {
         modelHandle,
         effort: next.effort,
-        modelId: next.id
+        modelId: next.id,
+        serviceTier
       };
       if (reasoningCycleTimerRef.current) {
         clearTimeout(reasoningCycleTimerRef.current);
@@ -492100,21 +492228,6 @@ async function handleConnectionCommand(msg, trimmed, ctx) {
     }
     return { submitted: true };
   }
-  if (trimmed.startsWith("/disconnect")) {
-    const cmd = commandRunner.start(msg, "Disconnecting...");
-    const { handleDisconnect: handleDisconnect2, setActiveCommandId: setActiveConnectCommandId } = await Promise.resolve().then(() => (init_connect(), exports_connect));
-    setActiveConnectCommandId(cmd.id);
-    try {
-      await handleDisconnect2({
-        buffersRef,
-        refreshDerived,
-        setCommandRunning
-      }, msg);
-    } finally {
-      setActiveConnectCommandId(null);
-    }
-    return { submitted: true };
-  }
   if (trimmed === "/server" || trimmed.startsWith("/server ") || trimmed === "/remote" || trimmed.startsWith("/remote ")) {
     const parts = Array.from(trimmed.matchAll(/"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|(\S+)/g), (match4) => match4[1] ?? match4[2] ?? match4[3]);
     let name;
@@ -494943,76 +495056,35 @@ ${SYSTEM_REMINDER_CLOSE}`;
           cmd.fail("Memory filesystem is not enabled. Use /remember instead.");
           return { submitted: true };
         }
-        const reflectConversationId = conversationIdRef.current ?? "default";
-        if (hasActiveReflectionSubagent2(agentId, reflectConversationId)) {
-          cmd.fail("A reflection agent is already running in the background.");
-          return { submitted: true };
-        }
         try {
-          const reflectionConversationId = conversationIdRef.current;
-          let systemPrompt;
-          try {
-            const agent2 = await getBackend().retrieveAgent(agentId);
-            systemPrompt = agent2.system ?? undefined;
-          } catch {}
-          const autoPayload = await buildAutoReflectionPayload(agentId, reflectionConversationId, systemPrompt);
-          if (!autoPayload) {
-            cmd.fail("No new transcript content to reflect on.");
-            return { submitted: true };
-          }
-          const memoryDir = getScopedMemoryFilesystemRoot(agentId);
-          const parentMemory = await buildParentMemorySnapshot(memoryDir);
-          const reflectionPrompt = buildReflectionSubagentPrompt({
-            memoryDir,
-            parentMemory
-          });
-          const {
-            spawnBackgroundSubagentTask: spawnBackgroundSubagentTask2,
-            waitForBackgroundSubagentAgentId: waitForBackgroundSubagentAgentId2
-          } = await Promise.resolve().then(() => (init_task(), exports_task));
-          const { subagentId } = spawnBackgroundSubagentTask2({
-            subagentType: "reflection",
-            prompt: reflectionPrompt,
+          const reflectionConversationId = conversationIdRef.current ?? "default";
+          const result2 = await launchReflectionSubagent({
+            agentId,
+            conversationId: reflectionConversationId,
+            memfsEnabled: isActiveMemfsEnabled(agentId),
+            triggerSource: "manual",
             description: "Reflecting on conversation",
-            silentCompletion: true,
-            transcriptPath: autoPayload.payloadPath,
-            parentScope: {
-              agentId,
-              conversationId: reflectionConversationId
-            },
-            onComplete: async ({
-              success: success2,
-              error: error54,
-              agentId: reflectionAgentId2
-            }) => {
-              telemetry.trackReflectionEnd("manual", success2, {
-                subagentId: reflectionAgentId2 ?? undefined,
-                conversationId: reflectionConversationId,
-                error: error54
-              });
-              await finalizeAutoReflectionPayload(agentId, reflectionConversationId, autoPayload.payloadPath, autoPayload.endSnapshotLine, success2);
-              const msg2 = await handleMemorySubagentCompletion({
-                agentId,
-                conversationId: conversationIdRef.current,
-                subagentType: "reflection",
-                success: success2,
-                error: error54
-              }, {
-                recompileByConversation: systemPromptRecompileByConversationRef.current,
-                recompileQueuedByConversation: queuedSystemPromptRecompileByConversationRef.current,
-                logRecompileFailure: (message2) => debugWarn("memory", message2)
-              });
-              appendTaskNotificationEvents([msg2]);
+            completionConversationId: () => conversationIdRef.current,
+            recompileByConversation: systemPromptRecompileByConversationRef.current,
+            recompileQueuedByConversation: queuedSystemPromptRecompileByConversationRef.current,
+            onCompletionMessage: (completionMessage) => {
+              appendTaskNotificationEvents([completionMessage]);
             }
           });
-          const reflectionAgentId = await waitForBackgroundSubagentAgentId2(subagentId, 1000);
-          telemetry.trackReflectionStart("manual", {
-            subagentId: reflectionAgentId ?? undefined,
-            conversationId: reflectionConversationId,
-            startMessageId: autoPayload.startMessageId,
-            endMessageId: autoPayload.endMessageId
-          });
-          cmd.finish(`Reflecting on the recent conversation. View the transcript here: ${autoPayload.payloadPath}`, true);
+          if (!result2.launched) {
+            if (result2.reason === "already_active") {
+              cmd.fail("A reflection agent is already running in the background.");
+            } else if (result2.reason === "no_payload") {
+              cmd.fail("No new transcript content to reflect on.");
+            } else if (result2.reason === "memfs_disabled") {
+              cmd.fail("Memory filesystem is not enabled. Use /remember instead.");
+            } else {
+              const errorDetails = formatErrorDetails2(result2.error ?? "Unknown error", agentId);
+              cmd.fail(`Failed to start reflection agent: ${errorDetails}`);
+            }
+            return { submitted: true };
+          }
+          cmd.finish(`Reflecting on the recent conversation. View the transcript here: ${result2.payloadPath}`, true);
         } catch (error54) {
           const errorDetails = formatErrorDetails2(error54, agentId);
           cmd.fail(`Failed to start reflection agent: ${errorDetails}`);
@@ -495414,84 +495486,21 @@ ${SYSTEM_REMINDER_CLOSE}
       reminderParts.push({ type: "text", text: text2 });
     };
     const maybeLaunchReflectionSubagent = async (triggerSource) => {
-      if (!memfsEnabledForAgent) {
-        return false;
-      }
-      const autoReflectConversationId = conversationIdRef.current ?? "default";
-      if (hasActiveReflectionSubagent2(agentId, autoReflectConversationId)) {
-        debugLog("memory", `Skipping auto reflection launch (${triggerSource}) because one is already active`);
-        return false;
-      }
-      try {
-        const reflectionConversationId = conversationIdRef.current;
-        let systemPrompt;
-        try {
-          const agent2 = await getBackend().retrieveAgent(agentId);
-          systemPrompt = agent2.system ?? undefined;
-        } catch {}
-        const autoPayload = await buildAutoReflectionPayload(agentId, reflectionConversationId, systemPrompt);
-        if (!autoPayload) {
-          debugLog("memory", `Skipping auto reflection launch (${triggerSource}) because transcript has no new content`);
-          return false;
+      const reflectionConversationId = conversationIdRef.current ?? "default";
+      const result = await launchReflectionSubagent({
+        agentId,
+        conversationId: reflectionConversationId,
+        memfsEnabled: memfsEnabledForAgent,
+        triggerSource,
+        description: AUTO_REFLECTION_DESCRIPTION,
+        completionConversationId: () => conversationIdRef.current,
+        recompileByConversation: systemPromptRecompileByConversationRef.current,
+        recompileQueuedByConversation: queuedSystemPromptRecompileByConversationRef.current,
+        onCompletionMessage: (completionMessage) => {
+          appendTaskNotificationEvents([completionMessage]);
         }
-        const memoryDir = getScopedMemoryFilesystemRoot(agentId);
-        const parentMemory = await buildParentMemorySnapshot(memoryDir);
-        const reflectionPrompt = buildReflectionSubagentPrompt({
-          memoryDir,
-          parentMemory
-        });
-        const {
-          spawnBackgroundSubagentTask: spawnBackgroundSubagentTask2,
-          waitForBackgroundSubagentAgentId: waitForBackgroundSubagentAgentId2
-        } = await Promise.resolve().then(() => (init_task(), exports_task));
-        const { subagentId } = spawnBackgroundSubagentTask2({
-          subagentType: "reflection",
-          prompt: reflectionPrompt,
-          description: AUTO_REFLECTION_DESCRIPTION3,
-          silentCompletion: true,
-          transcriptPath: autoPayload.payloadPath,
-          parentScope: {
-            agentId,
-            conversationId: reflectionConversationId
-          },
-          onComplete: async ({
-            success: success2,
-            error: error54,
-            agentId: reflectionAgentId2
-          }) => {
-            telemetry.trackReflectionEnd(triggerSource, success2, {
-              subagentId: reflectionAgentId2 ?? undefined,
-              conversationId: reflectionConversationId,
-              error: error54
-            });
-            await finalizeAutoReflectionPayload(agentId, reflectionConversationId, autoPayload.payloadPath, autoPayload.endSnapshotLine, success2);
-            const msg2 = await handleMemorySubagentCompletion({
-              agentId,
-              conversationId: conversationIdRef.current,
-              subagentType: "reflection",
-              success: success2,
-              error: error54
-            }, {
-              recompileByConversation: systemPromptRecompileByConversationRef.current,
-              recompileQueuedByConversation: queuedSystemPromptRecompileByConversationRef.current,
-              logRecompileFailure: (message2) => debugWarn("memory", message2)
-            });
-            appendTaskNotificationEvents([msg2]);
-          }
-        });
-        const reflectionAgentId = await waitForBackgroundSubagentAgentId2(subagentId, 1000);
-        telemetry.trackReflectionStart(triggerSource, {
-          subagentId: reflectionAgentId ?? undefined,
-          conversationId: reflectionConversationId,
-          startMessageId: autoPayload.startMessageId,
-          endMessageId: autoPayload.endMessageId
-        });
-        debugLog("memory", `Auto-launched reflection subagent (${triggerSource})`);
-        return true;
-      } catch (error54) {
-        debugWarn("memory", `Failed to auto-launch reflection subagent (${triggerSource}): ${error54 instanceof Error ? error54.message : String(error54)}`);
-        return false;
-      }
+      });
+      return result.launched;
     };
     syncReminderStateFromContextTracker(sharedReminderStateRef.current, contextTrackerRef.current);
     const { getSkillSources: getSkillSources2 } = await Promise.resolve().then(() => (init_context(), exports_context));
@@ -495635,10 +495644,9 @@ var init_use_submit_handler = __esm(async () => {
   init_goal_command();
   init_init_command();
   init_memory_reminder();
-  init_memory_subagent_completion();
   init_paste_registry();
   init_reasoning_tab_toggle();
-  init_reflection_transcript();
+  init_reflection_launcher();
   init_system_prompt_warning();
   init_thinking_messages();
   init_constants2();
@@ -495653,10 +495661,8 @@ var init_use_submit_handler = __esm(async () => {
   init_debug();
   init_cwd_change();
   init_command_routing();
-  init_constants7();
   init_goal_loop();
   init_ids();
-  init_reflection2();
   init_session3();
   init_submit_connection_commands();
   init_submit_diagnostics_commands();
@@ -496006,6 +496012,10 @@ function App2({
     conversationOverrideModelSettings,
     setConversationOverrideModelSettings
   ] = import_react122.useState(null);
+  const conversationOverrideModelSettingsRef = import_react122.useRef(conversationOverrideModelSettings);
+  import_react122.useEffect(() => {
+    conversationOverrideModelSettingsRef.current = conversationOverrideModelSettings;
+  }, [conversationOverrideModelSettings]);
   const [
     conversationOverrideContextWindowLimit,
     setConversationOverrideContextWindowLimit
@@ -496037,6 +496047,7 @@ function App2({
   const currentModelLabel = tempModelOverride || currentModelHandle || agentState?.model || (llmConfig?.model_endpoint_type && llmConfig?.model ? `${llmConfig.model_endpoint_type}/${llmConfig.model}` : llmConfig?.model ?? null) || null;
   const effectiveModelSettings = hasConversationModelOverride ? conversationOverrideModelSettings : agentState?.model_settings;
   const derivedReasoningEffort = deriveReasoningEffort(effectiveModelSettings, llmConfig);
+  const currentModelServiceTier = effectiveModelSettings?.service_tier === CHATGPT_FAST_SERVICE_TIER && currentModelLabel && getChatGptFastRegistryHandleForModelHandle(currentModelLabel) ? CHATGPT_FAST_SERVICE_TIER : null;
   const startupModelDisplayOverride = getStartupModelDisplayOverride({
     isLocalBackend: isLocalBackendEnabled(),
     startupHasAvailableLocalModels: hasAvailableLocalModels
@@ -496049,7 +496060,8 @@ function App2({
     const info = getModelInfoForLlmConfig(currentModelLabel, {
       reasoning_effort: derivedReasoningEffort ?? null,
       enable_reasoner: llmConfig?.enable_reasoner ?? null,
-      context_window: llmConfig?.context_window ?? null
+      context_window: llmConfig?.context_window ?? null,
+      service_tier: currentModelServiceTier
     });
     if (info) {
       return info.shortLabel ?? info.label;
@@ -496058,6 +496070,7 @@ function App2({
   }, [
     currentModelLabel,
     derivedReasoningEffort,
+    currentModelServiceTier,
     llmConfig,
     startupModelDisplayOverride
   ]);
@@ -497553,10 +497566,12 @@ function App2({
         const hasConversationModelSettings = conversationModelSettings2 !== undefined && conversationModelSettings2 !== null && Object.keys(conversationModelSettings2).length > 0;
         const resolvedConversationModelSettings = hasConversationModelSettings ? conversationModelSettings2 : conversationModel === undefined || conversationModel === null || conversationModel === agentModelHandle ? agentState.model_settings ?? null : null;
         const reasoningEffort = deriveReasoningEffort(resolvedConversationModelSettings, agentState.llm_config);
+        const conversationServiceTier = resolvedConversationModelSettings?.service_tier === CHATGPT_FAST_SERVICE_TIER && getChatGptFastRegistryHandleForModelHandle(effectiveModelHandle) ? CHATGPT_FAST_SERVICE_TIER : null;
         const modelInfo = getModelInfoForLlmConfig(effectiveModelHandle, {
           reasoning_effort: reasoningEffort,
           enable_reasoner: agentState.llm_config.enable_reasoner ?? null,
-          context_window: conversationContextWindowLimit ?? null
+          context_window: conversationContextWindowLimit ?? null,
+          service_tier: conversationServiceTier
         });
         const modelPresetContextWindow2 = modelInfo?.updateArgs?.context_window;
         const resolvedConversationContextWindowLimit = conversationContextWindowLimit === undefined ? typeof modelPresetContextWindow2 === "number" ? modelPresetContextWindow2 : null : conversationContextWindowLimit;
@@ -498301,7 +498316,7 @@ Memory may be stale. Try running: git -C ${getScopedMemoryFilesystemRoot(agentId
           backendMode: action3.backendMode
         });
       } else if (action3.type === "switch_model") {
-        handleModelSelect(action3.modelId, action3.commandId);
+        handleModelSelect(action3.modelSelection ?? action3.modelId, action3.commandId);
       } else if (action3.type === "set_sleeptime") {
         handleSleeptimeModeSelect(action3.settings, action3.commandId);
       } else if (action3.type === "set_compaction") {
@@ -498443,6 +498458,7 @@ Memory may be stale. Try running: git -C ${getScopedMemoryFilesystemRoot(agentId
     agentIdRef,
     agentStateRef,
     commandRunner,
+    conversationOverrideModelSettingsRef,
     conversationIdRef,
     hasConversationModelOverrideRef,
     isAgentBusy,
@@ -498647,6 +498663,7 @@ Memory may be stale. Try running: git -C ${getScopedMemoryFilesystemRoot(agentId
     currentModelDisplay,
     currentModelHandle,
     currentModelId,
+    currentModelServiceTier,
     currentModelProvider,
     isLocalBackend,
     currentPersonalityId,
@@ -501846,7 +501863,8 @@ function supportsDistinctAnthropicXHighEffort2(modelHandle) {
   return modelHandle.includes("claude-opus-4-7") || modelHandle.includes("claude-opus-4-8");
 }
 function buildModelSettings2(modelHandle, updateArgs) {
-  const isOpenAI = modelHandle.startsWith("openai/") || modelHandle.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`);
+  const isOpenAICodex = modelHandle.startsWith("openai-codex/");
+  const isOpenAI = modelHandle.startsWith("openai/") || isOpenAICodex || modelHandle.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`);
   const isAnthropic = modelHandle.startsWith("anthropic/") || modelHandle.startsWith("claude-pro-max/") || modelHandle.startsWith("minimax/");
   const isZai = modelHandle.startsWith("zai/");
   const isGoogleAI = modelHandle.startsWith("google_ai/");
@@ -501859,6 +501877,9 @@ function buildModelSettings2(modelHandle, updateArgs) {
       provider_type: "openai",
       parallel_tool_calls: true
     };
+    if (isOpenAICodex) {
+      openaiSettings.provider_type = "chatgpt_oauth";
+    }
     if (updateArgs?.reasoning_effort) {
       openaiSettings.reasoning = {
         reasoning_effort: updateArgs.reasoning_effort
@@ -501871,6 +501892,9 @@ function buildModelSettings2(modelHandle, updateArgs) {
     if (typeof updateArgs?.strict === "boolean") {
       openaiSettings.strict = updateArgs.strict;
     }
+    if (updateArgs && "service_tier" in updateArgs) {
+      openaiSettings.service_tier = updateArgs.service_tier === "priority" ? "priority" : null;
+    }
     settings3 = openaiSettings;
   } else if (isAnthropic) {
     const anthropicSettings = {
@@ -505720,7 +505744,7 @@ async function runConnectSubcommand(argv, deps = {}) {
       if (provider.target !== "local") {
         await io.ensureSettingsReady();
         if (await io.isChatGPTOAuthConnected()) {
-          io.stdout("Already connected to ChatGPT via OAuth. Disconnect first if you want to re-authenticate.");
+          io.stdout("Already connected to ChatGPT via OAuth. Use /connect in the TUI and select ChatGPT / Codex plan to disconnect or re-authenticate.");
           return 0;
         }
         await io.runChatGPTOAuthConnectFlow({
@@ -512405,4 +512429,4 @@ Error during initialization: ${message}`);
 }
 main2();
 
-//# debugId=FB2D67983121CCDA64756E2164756E21
+//# debugId=2016C33D7C4F1E2064756E2164756E21