@letta-ai/letta-code 0.28.1 → 0.28.2

package/letta.js

@@ -4815,7 +4815,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.28.1",
+    version: "0.28.2",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     packageManager: "bun@1.3.0",
@@ -155344,6 +155344,9 @@ var init_byok_providers = __esm(() => {
   ];
 });
 
+// src/providers/openai-codex-constants.ts
+var OPENAI_CODEX_PROVIDER_NAME = "chatgpt-plus-pro";
+
 // src/providers/openai-codex-provider.ts
 function normalizeChatGPTOAuthProviderName(providerName) {
   const normalized = (providerName ?? OPENAI_CODEX_PROVIDER_NAME).trim();
@@ -155384,7 +155387,7 @@ async function createOrUpdateOpenAICodexProvider(config3, options3 = {}, provide
   }
   return createOpenAICodexProvider(config3, options3, normalizedProviderName);
 }
-var OPENAI_CODEX_PROVIDER_NAME = "chatgpt-plus-pro", CHATGPT_OAUTH_PROVIDER_NAME_PATTERN, CHATGPT_OAUTH_PROVIDER_TYPE = "chatgpt_oauth";
+var CHATGPT_OAUTH_PROVIDER_NAME_PATTERN, CHATGPT_OAUTH_PROVIDER_TYPE = "chatgpt_oauth";
 var init_openai_codex_provider = __esm(() => {
   init_metadata();
   init_byok_providers();
@@ -161540,14 +161543,187 @@ var init_model_catalog = __esm(() => {
   models2 = models_default.models;
 });
 
+// src/agent/model-handles.ts
+function normalizeModelHandleForRegistry(modelHandle) {
+  if (!modelHandle)
+    return null;
+  const [provider, ...modelParts] = modelHandle.split("/");
+  const model = modelParts.join("/");
+  if (provider === CHATGPT_OAUTH_LLM_CONFIG_PROVIDER && model.length > 0) {
+    return `${OPENAI_CODEX_PROVIDER_NAME}/${model}`;
+  }
+  if (provider === LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX.slice(0, -1) && model.length > 0 && !model.endsWith("-fast")) {
+    return `${OPENAI_CODEX_PROVIDER_NAME}/${model}`;
+  }
+  if (provider === "lc-anthropic" && model.length > 0) {
+    return `anthropic/${model}`;
+  }
+  return modelHandle;
+}
+function modelPortionFromHandle(modelHandle) {
+  const slashIndex = modelHandle.indexOf("/");
+  if (slashIndex === -1)
+    return null;
+  return modelHandle.slice(slashIndex + 1);
+}
+function providerPrefix(modelHandle) {
+  const slashIndex = modelHandle.indexOf("/");
+  if (slashIndex <= 0)
+    return null;
+  return modelHandle.slice(0, slashIndex);
+}
+function isKnownModelProviderPrefix(provider) {
+  return KNOWN_LLM_CONFIG_ENDPOINT_TYPES.has(provider) || MODEL_HANDLE_PROVIDER_PREFIXES.has(provider) || LOCAL_MODEL_PROVIDER_PREFIXES.has(provider);
+}
+function isKnownProviderPrefixedHandle(modelHandle) {
+  const provider = providerPrefix(modelHandle);
+  return provider !== null && isKnownModelProviderPrefix(provider);
+}
+function modelHandleProviderForEndpointType(endpointType) {
+  return LLM_CONFIG_ENDPOINT_TYPE_MODEL_HANDLE_PROVIDERS.get(endpointType) ?? endpointType;
+}
+function endpointTypeMatchesModelProvider(endpointType, modelProvider) {
+  return endpointType === modelProvider || modelHandleProviderForEndpointType(endpointType) === modelProvider || endpointType === CHATGPT_OAUTH_LLM_CONFIG_PROVIDER && modelProvider === "openai-codex" || endpointType === "openai";
+}
+function exactRegistryModelHandle(modelHandle) {
+  const registryHandle = normalizeModelHandleForRegistry(modelHandle) ?? modelHandle;
+  return models2.some((model) => model.handle === registryHandle) ? registryHandle : null;
+}
+function uniqueRegistryHandleForModelName(modelName) {
+  const matches = new Set(models2.filter((model) => modelPortionFromHandle(model.handle) === modelName).map((model) => model.handle));
+  return matches.size === 1 ? [...matches][0] ?? null : null;
+}
+function normalizeKnownModelHandle(modelHandle) {
+  const registryHandle = normalizeModelHandleForRegistry(modelHandle) ?? modelHandle;
+  const exact = exactRegistryModelHandle(registryHandle);
+  if (exact)
+    return exact;
+  const model = modelPortionFromHandle(registryHandle);
+  if (!model) {
+    return uniqueRegistryHandleForModelName(registryHandle) ?? registryHandle;
+  }
+  const provider = providerPrefix(registryHandle);
+  if (provider && !isKnownModelProviderPrefix(provider)) {
+    return registryHandle;
+  }
+  return uniqueRegistryHandleForModelName(model) ?? registryHandle;
+}
+function resolveModelHandleFromLlmConfig(llmConfig) {
+  if (!llmConfig?.model)
+    return null;
+  const model = llmConfig.model;
+  const endpointType = llmConfig.model_endpoint_type;
+  if (endpointType) {
+    const normalizedModel2 = normalizeModelHandleForRegistry(model) ?? model;
+    const modelProvider = providerPrefix(normalizedModel2);
+    if (modelProvider && isKnownModelProviderPrefix(modelProvider) && endpointTypeMatchesModelProvider(endpointType, modelProvider)) {
+      return normalizeKnownModelHandle(normalizedModel2);
+    }
+    return normalizeKnownModelHandle(`${modelHandleProviderForEndpointType(endpointType)}/${model}`);
+  }
+  const normalizedModel = normalizeKnownModelHandle(model);
+  if (normalizedModel !== model || exactRegistryModelHandle(normalizedModel) || isKnownProviderPrefixedHandle(normalizedModel)) {
+    return normalizedModel;
+  }
+  return model;
+}
+function endpointTypeForModelHandleProvider(provider) {
+  const alias = MODEL_HANDLE_PROVIDER_LLM_CONFIG_ENDPOINT_TYPES.get(provider);
+  if (alias)
+    return alias;
+  if (KNOWN_LLM_CONFIG_ENDPOINT_TYPES.has(provider))
+    return provider;
+  if (LOCAL_MODEL_PROVIDER_PREFIXES.has(provider))
+    return provider;
+  return null;
+}
+function endpointTypeForModelHandle(provider, providerType) {
+  const inferred = endpointTypeForModelHandleProvider(provider);
+  if (!providerType)
+    return inferred;
+  const compatibleProviderType = MODEL_SETTINGS_PROVIDER_LLM_CONFIG_ENDPOINT_TYPES.get(providerType) ?? providerType;
+  if (!isKnownModelProviderPrefix(provider))
+    return compatibleProviderType;
+  if (providerType === "openai" && provider !== "openai")
+    return inferred;
+  return endpointTypeMatchesModelProvider(providerType, provider) ? compatibleProviderType : inferred;
+}
+function mapModelHandleToLlmConfigPatch(modelHandle, providerType) {
+  const normalizedHandle = normalizeKnownModelHandle(modelHandle);
+  const provider = providerPrefix(normalizedHandle);
+  const model = modelPortionFromHandle(normalizedHandle);
+  if (!provider || !model) {
+    return { model: normalizedHandle };
+  }
+  const endpointType = endpointTypeForModelHandle(provider, providerType);
+  if (!endpointType) {
+    return { model: normalizedHandle };
+  }
+  const compatibleModel = endpointType === "openai" && provider !== "openai" ? normalizedHandle : model;
+  return { model: compatibleModel, model_endpoint_type: endpointType };
+}
+var LOCAL_MODEL_HANDLE_PREFIXES, LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX = "openai-codex/", CHATGPT_OAUTH_LLM_CONFIG_PROVIDER = "chatgpt_oauth", KNOWN_LLM_CONFIG_ENDPOINT_TYPES, LLM_CONFIG_ENDPOINT_TYPE_MODEL_HANDLE_PROVIDERS, MODEL_HANDLE_PROVIDER_LLM_CONFIG_ENDPOINT_TYPES, MODEL_SETTINGS_PROVIDER_LLM_CONFIG_ENDPOINT_TYPES, MODEL_HANDLE_PROVIDER_PREFIXES, LOCAL_MODEL_PROVIDER_PREFIXES;
+var init_model_handles = __esm(() => {
+  init_model_catalog();
+  LOCAL_MODEL_HANDLE_PREFIXES = [
+    "ollama/",
+    "ollama-cloud/",
+    "lmstudio/",
+    "llama.cpp/",
+    "llama-cpp/"
+  ];
+  KNOWN_LLM_CONFIG_ENDPOINT_TYPES = new Set([
+    "anthropic",
+    "bedrock",
+    "chatgpt_oauth",
+    "google_ai",
+    "google_vertex",
+    "minimax",
+    "moonshot",
+    "moonshot_coding",
+    "openai",
+    "openrouter",
+    "zai",
+    "zai_coding"
+  ]);
+  LLM_CONFIG_ENDPOINT_TYPE_MODEL_HANDLE_PROVIDERS = new Map([
+    [CHATGPT_OAUTH_LLM_CONFIG_PROVIDER, OPENAI_CODEX_PROVIDER_NAME],
+    ["lmstudio", "lmstudio"],
+    ["lmstudio_openai", "lmstudio"],
+    ["llamacpp", "llama.cpp"],
+    ["llama_cpp", "llama.cpp"],
+    ["llama.cpp", "llama.cpp"],
+    ["ollama_cloud", "ollama-cloud"]
+  ]);
+  MODEL_HANDLE_PROVIDER_LLM_CONFIG_ENDPOINT_TYPES = new Map([
+    [OPENAI_CODEX_PROVIDER_NAME, CHATGPT_OAUTH_LLM_CONFIG_PROVIDER],
+    ["openai-codex", CHATGPT_OAUTH_LLM_CONFIG_PROVIDER],
+    ["lmstudio", "lmstudio"],
+    ["llama.cpp", "llamacpp"],
+    ["llama-cpp", "llamacpp"],
+    ["ollama-cloud", "openai"]
+  ]);
+  MODEL_SETTINGS_PROVIDER_LLM_CONFIG_ENDPOINT_TYPES = new Map([
+    ["lmstudio_openai", "lmstudio"],
+    ["llama_cpp", "llamacpp"],
+    ["llama.cpp", "llamacpp"],
+    ["ollama_cloud", "openai"]
+  ]);
+  MODEL_HANDLE_PROVIDER_PREFIXES = new Set(models2.map((model) => providerPrefix(model.handle)).filter((provider) => provider !== null));
+  LOCAL_MODEL_PROVIDER_PREFIXES = new Set(LOCAL_MODEL_HANDLE_PREFIXES.map((prefix) => prefix.slice(0, -1)));
+});
+
 // src/agent/model.ts
 var exports_model = {};
 __export(exports_model, {
   shouldPreserveContextWindowForModelSelection: () => shouldPreserveContextWindowForModelSelection,
+  resolveModelHandleFromLlmConfig: () => resolveModelHandleFromLlmConfig,
   resolveModelByLlmConfig: () => resolveModelByLlmConfig,
   resolveModel: () => resolveModel,
   normalizeModelHandleForRegistry: () => normalizeModelHandleForRegistry,
+  normalizeKnownModelHandle: () => normalizeKnownModelHandle,
   models: () => models2,
+  mapModelHandleToLlmConfigPatch: () => mapModelHandleToLlmConfigPatch,
   isLocalModelHandle: () => isLocalModelHandle,
   isLocalChatGptOAuthModelHandle: () => isLocalChatGptOAuthModelHandle,
   getResumeRefreshArgs: () => getResumeRefreshArgs,
@@ -161569,34 +161745,12 @@ function isLocalModelHandle(modelHandle) {
   return LOCAL_MODEL_HANDLE_PREFIXES.some((prefix) => modelHandle.startsWith(prefix));
 }
 function getLocalModelLabel(modelHandle) {
-  const providerPrefix = LOCAL_MODEL_HANDLE_PREFIXES.find((prefix) => modelHandle.startsWith(prefix));
-  return providerPrefix ? modelHandle.slice(providerPrefix.length) : modelHandle;
+  const providerPrefix2 = LOCAL_MODEL_HANDLE_PREFIXES.find((prefix) => modelHandle.startsWith(prefix));
+  return providerPrefix2 ? modelHandle.slice(providerPrefix2.length) : 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 && model.length > 0) {
-    return `${OPENAI_CODEX_PROVIDER_NAME}/${model}`;
-  }
-  if (provider === LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX.slice(0, -1) && model.length > 0 && !model.endsWith("-fast")) {
-    return `${OPENAI_CODEX_PROVIDER_NAME}/${model}`;
-  }
-  if (provider === "lc-anthropic" && model.length > 0) {
-    return `anthropic/${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);
 }
@@ -161608,7 +161762,7 @@ function getChatGptFastRegistryHandleForModelHandle(modelHandle) {
   const normalized = normalizeModelHandleForRegistry(modelHandle);
   if (!normalized?.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`))
     return null;
-  const model = modelPortion(normalized);
+  const model = modelPortionFromHandle(normalized);
   if (!model || model.endsWith("-fast"))
     return null;
   const fastHandle = `${OPENAI_CODEX_PROVIDER_NAME}/${model}-fast`;
@@ -161782,17 +161936,17 @@ function findModelByHandle(handle) {
     return exactMatch;
   const [provider, ...rest3] = registryHandle.split("/");
   if (provider && rest3.length > 0) {
-    const modelPortion2 = rest3.join("/");
+    const modelPortion = 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(modelPortion2) || modelPortion2.includes(mModelPortion);
+      return mModelPortion.includes(modelPortion) || modelPortion.includes(mModelPortion);
     });
     const providerMatch = pickPreferred(providerMatches);
     if (providerMatch)
       return providerMatch;
-    const suffixMatches = models2.filter((m2) => m2.handle.endsWith(`/${modelPortion2}`));
+    const suffixMatches = models2.filter((m2) => m2.handle.endsWith(`/${modelPortion}`));
     const suffixMatch = pickPreferred(suffixMatches);
     if (suffixMatch)
       return suffixMatch;
@@ -161821,10 +161975,11 @@ function resolveModelByLlmConfig(llmConfigModel) {
     return exactMatch.id;
   return null;
 }
-var 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 REASONING_EFFORT_ORDER, LOCAL_REASONING_EFFORT_ORDER, CHATGPT_FAST_SERVICE_TIER = "priority", RESUME_REFRESH_FIELDS;
 var init_model = __esm(() => {
-  init_openai_codex_provider();
   init_model_catalog();
+  init_model_handles();
+  init_model_handles();
   REASONING_EFFORT_ORDER = [
     "none",
     "minimal",
@@ -161840,13 +161995,6 @@ var init_model = __esm(() => {
     "medium",
     "high"
   ];
-  LOCAL_MODEL_HANDLE_PREFIXES = [
-    "ollama/",
-    "ollama-cloud/",
-    "lmstudio/",
-    "llama.cpp/",
-    "llama-cpp/"
-  ];
   RESUME_REFRESH_FIELDS = [
     "max_output_tokens",
     "parallel_tool_calls"
@@ -179033,16 +179181,8 @@ var init_subagent_state = __esm(() => {
 });
 
 // src/mods/context.ts
-function buildModelHandleFromLlmConfig(llmConfig) {
-  if (!llmConfig)
-    return null;
-  if (llmConfig.model_endpoint_type && llmConfig.model) {
-    return `${llmConfig.model_endpoint_type}/${llmConfig.model}`;
-  }
-  return llmConfig.model ?? null;
-}
 function resolveModelContext(options3) {
-  const modelHandle = options3.modelIdentifier ?? options3.agent?.model ?? buildModelHandleFromLlmConfig(options3.agent?.llm_config) ?? options3.base?.model.id ?? null;
+  const modelHandle = options3.modelIdentifier ?? options3.agent?.model ?? resolveModelHandleFromLlmConfig(options3.agent?.llm_config) ?? options3.base?.model.id ?? null;
   const modelInfo = modelHandle ? getModelInfo(modelHandle) : null;
   const provider = modelInfo?.handle.split("/")[0] ?? modelHandle?.split("/")[0] ?? null;
   return {
@@ -179106,6 +179246,7 @@ function buildModInvocationContext(options3 = {}) {
 }
 var init_context2 = __esm(() => {
   init_model();
+  init_model_handles();
   init_subagent_state();
   init_runtime_context();
   init_version();
@@ -382464,8 +382605,125 @@ var init_context_budget = __esm(() => {
   REFLECTION_STARTUP_CONTEXT_CHAR_LIMIT = REFLECTION_STARTUP_CONTEXT_TOKEN_LIMIT * STARTUP_CONTEXT_ESTIMATED_CHARS_PER_TOKEN;
 });
 
-// src/agent/subagents/manager.ts
-import { spawn as spawn8 } from "node:child_process";
+// src/agent/subagents/subagent-launcher.ts
+function resolveSubagentWorkingDirectory(env3 = process.env, fallbackCwd = getCurrentWorkingDirectory(), options3 = {}) {
+  if (options3.subagentType === "reflection" && options3.launchProfile === "memory-subagent" && options3.memoryScope) {
+    return env3.USER_CWD || fallbackCwd;
+  }
+  const primaryRoot = options3.memoryScope?.primaryRoot ?? options3.inheritedPrimaryRoot;
+  if (options3.subagentType === "reflection" && options3.launchProfile === "memory-subagent" && primaryRoot) {
+    return primaryRoot;
+  }
+  return env3.USER_CWD || fallbackCwd;
+}
+function resolveSubagentLauncher(cliArgs, options3 = {}) {
+  const env3 = options3.env ?? process.env;
+  const argv = options3.argv ?? process.argv;
+  const execPath = options3.execPath ?? process.execPath;
+  const platform3 = options3.platform ?? process.platform;
+  const cwd = options3.cwd ?? process.cwd();
+  const invocation = resolveLettaInvocation(env3, argv, execPath, cwd);
+  if (invocation) {
+    return {
+      command: invocation.command,
+      args: [...invocation.args, ...cliArgs]
+    };
+  }
+  const currentScript = argv[1] || "";
+  const resolvedCurrentScript = resolveEntryScriptPath(currentScript, cwd);
+  if (currentScript.endsWith(".ts")) {
+    return {
+      command: execPath,
+      args: [resolvedCurrentScript, ...cliArgs]
+    };
+  }
+  if (currentScript.endsWith(".js") && platform3 === "win32") {
+    return {
+      command: execPath,
+      args: [resolvedCurrentScript, ...cliArgs]
+    };
+  }
+  if (currentScript.endsWith(".js")) {
+    return {
+      command: resolvedCurrentScript,
+      args: cliArgs
+    };
+  }
+  return {
+    command: "letta",
+    args: cliArgs
+  };
+}
+function buildInheritedChannelContextPayload(runtimeContext) {
+  const channelToolScope = runtimeContext?.channelToolScope;
+  const channelTurnSources = runtimeContext?.channelTurnSources ?? [];
+  if (!channelToolScope?.channels.length && channelTurnSources.length === 0) {
+    return null;
+  }
+  return {
+    ...channelToolScope?.channels.length ? { channelToolScope } : {},
+    ...channelTurnSources.length ? { channelTurnSources: [...channelTurnSources] } : {}
+  };
+}
+function composeSubagentChildEnv(options3) {
+  const {
+    parentProcessEnv,
+    backendMode,
+    localBackendStorageDir,
+    parentAgentId,
+    launchProfile,
+    inheritedPrimaryRoot,
+    memoryScope,
+    inheritedApiKey,
+    inheritedBaseUrl,
+    transcriptPath,
+    inheritedChannelContext
+  } = options3;
+  const childEnv = {
+    ...parentProcessEnv,
+    ...inheritedApiKey && { LETTA_API_KEY: inheritedApiKey },
+    ...inheritedBaseUrl && { LETTA_BASE_URL: inheritedBaseUrl },
+    LETTA_CODE_AGENT_ROLE: "subagent",
+    ...parentAgentId && { LETTA_PARENT_AGENT_ID: parentAgentId },
+    ...transcriptPath && { TRANSCRIPT_PATH: transcriptPath },
+    ...inheritedChannelContext && {
+      [LETTA_INHERITED_CHANNEL_CONTEXT_ENV]: JSON.stringify(inheritedChannelContext)
+    }
+  };
+  if (backendMode === "local") {
+    childEnv.LETTA_LOCAL_BACKEND_EXPERIMENTAL = "1";
+    if (localBackendStorageDir) {
+      childEnv.LETTA_LOCAL_BACKEND_DIR = localBackendStorageDir;
+    }
+  } else if (backendMode === "api") {
+    childEnv.LETTA_LOCAL_BACKEND_EXPERIMENTAL = "0";
+  }
+  if (launchProfile === "memory-subagent") {
+    const primaryRoot = memoryScope?.primaryRoot ?? inheritedPrimaryRoot;
+    if (primaryRoot) {
+      childEnv.MEMORY_DIR = primaryRoot;
+      childEnv.LETTA_MEMORY_DIR = primaryRoot;
+    } else {
+      delete childEnv.MEMORY_DIR;
+      delete childEnv.LETTA_MEMORY_DIR;
+    }
+  }
+  return childEnv;
+}
+function resolveSubagentInheritedPrimaryRoot(options3) {
+  if (options3.backendMode === "local" && options3.parentAgentId) {
+    return getLocalBackendMemoryFilesystemRoot(options3.parentAgentId, options3.localBackendStorageDir ?? getLocalBackendStorageDir2());
+  }
+  return options3.inheritedPrimaryRoot;
+}
+var init_subagent_launcher = __esm(() => {
+  init_backend2();
+  init_paths();
+  init_runtime_context();
+  init_shell_env();
+});
+
+// src/agent/subagents/subagent-model.ts
 function getModelHandleFromAgent(agent2) {
   const directModel = agent2.model;
   if (directModel?.includes("/")) {
@@ -382504,9 +382762,6 @@ async function getPrimaryAgentModelHandle(scope = {}) {
 async function getCurrentBillingTier() {
   return getBillingTier();
 }
-function isProviderNotSupportedError(errorOutput) {
-  return errorOutput.includes("Provider") && errorOutput.includes("is not supported") && errorOutput.includes("supported providers:");
-}
 function getProviderPrefix(handle) {
   const slashIndex = handle.indexOf("/");
   if (slashIndex === -1)
@@ -382523,8 +382778,8 @@ function swapProviderPrefix(parentHandle, recommendedHandle) {
   const recommendedProvider = getProviderPrefix(recommendedHandle);
   if (!recommendedProvider || recommendedProvider !== baseProvider)
     return null;
-  const modelPortion2 = recommendedHandle.slice(recommendedProvider.length + 1);
-  return `${parentProvider}/${modelPortion2}`;
+  const modelPortion = recommendedHandle.slice(recommendedProvider.length + 1);
+  return `${parentProvider}/${modelPortion}`;
 }
 function isInheritModel(model) {
   return model?.trim().toLowerCase() === "inherit";
@@ -382608,6 +382863,26 @@ async function resolveSubagentModel(options3) {
   }
   return recommendedHandle;
 }
+var BYOK_PROVIDER_TO_BASE;
+var init_subagent_model = __esm(() => {
+  init_available_models();
+  init_context();
+  init_model();
+  init_backend2();
+  init_metadata();
+  BYOK_PROVIDER_TO_BASE = {
+    "lc-anthropic": "anthropic",
+    "lc-openai": "openai",
+    "lc-zai": "zai",
+    "lc-gemini": "google_ai",
+    "lc-openrouter": "openrouter",
+    "lc-minimax": "minimax",
+    "lc-bedrock": "bedrock",
+    "chatgpt-plus-pro": "chatgpt-plus-pro"
+  };
+});
+
+// src/agent/subagents/subagent-stream.ts
 function recordToolCall(subagentId, toolCallId, toolName, toolArgs, displayedToolCalls) {
   if (!toolCallId || !toolName || displayedToolCalls.has(toolCallId))
     return;
@@ -382711,115 +382986,16 @@ function parseResultFromStdout(stdout, agentId) {
     };
   }
 }
-function resolveSubagentWorkingDirectory(env3 = process.env, fallbackCwd = getCurrentWorkingDirectory(), options3 = {}) {
-  if (options3.subagentType === "reflection" && options3.launchProfile === "memory-subagent" && options3.memoryScope) {
-    return env3.USER_CWD || fallbackCwd;
-  }
-  const primaryRoot = options3.memoryScope?.primaryRoot ?? options3.inheritedPrimaryRoot;
-  if (options3.subagentType === "reflection" && options3.launchProfile === "memory-subagent" && primaryRoot) {
-    return primaryRoot;
-  }
-  return env3.USER_CWD || fallbackCwd;
-}
-function resolveSubagentLauncher(cliArgs, options3 = {}) {
-  const env3 = options3.env ?? process.env;
-  const argv = options3.argv ?? process.argv;
-  const execPath = options3.execPath ?? process.execPath;
-  const platform3 = options3.platform ?? process.platform;
-  const cwd = options3.cwd ?? process.cwd();
-  const invocation = resolveLettaInvocation(env3, argv, execPath, cwd);
-  if (invocation) {
-    return {
-      command: invocation.command,
-      args: [...invocation.args, ...cliArgs]
-    };
-  }
-  const currentScript = argv[1] || "";
-  const resolvedCurrentScript = resolveEntryScriptPath(currentScript, cwd);
-  if (currentScript.endsWith(".ts")) {
-    return {
-      command: execPath,
-      args: [resolvedCurrentScript, ...cliArgs]
-    };
-  }
-  if (currentScript.endsWith(".js") && platform3 === "win32") {
-    return {
-      command: execPath,
-      args: [resolvedCurrentScript, ...cliArgs]
-    };
-  }
-  if (currentScript.endsWith(".js")) {
-    return {
-      command: resolvedCurrentScript,
-      args: cliArgs
-    };
-  }
-  return {
-    command: "letta",
-    args: cliArgs
-  };
-}
-function buildInheritedChannelContextPayload(runtimeContext) {
-  const channelToolScope = runtimeContext?.channelToolScope;
-  const channelTurnSources = runtimeContext?.channelTurnSources ?? [];
-  if (!channelToolScope?.channels.length && channelTurnSources.length === 0) {
-    return null;
-  }
-  return {
-    ...channelToolScope?.channels.length ? { channelToolScope } : {},
-    ...channelTurnSources.length ? { channelTurnSources: [...channelTurnSources] } : {}
-  };
-}
-function composeSubagentChildEnv(options3) {
-  const {
-    parentProcessEnv,
-    backendMode,
-    localBackendStorageDir,
-    parentAgentId,
-    launchProfile,
-    inheritedPrimaryRoot,
-    memoryScope,
-    inheritedApiKey,
-    inheritedBaseUrl,
-    transcriptPath,
-    inheritedChannelContext
-  } = options3;
-  const childEnv = {
-    ...parentProcessEnv,
-    ...inheritedApiKey && { LETTA_API_KEY: inheritedApiKey },
-    ...inheritedBaseUrl && { LETTA_BASE_URL: inheritedBaseUrl },
-    LETTA_CODE_AGENT_ROLE: "subagent",
-    ...parentAgentId && { LETTA_PARENT_AGENT_ID: parentAgentId },
-    ...transcriptPath && { TRANSCRIPT_PATH: transcriptPath },
-    ...inheritedChannelContext && {
-      [LETTA_INHERITED_CHANNEL_CONTEXT_ENV]: JSON.stringify(inheritedChannelContext)
-    }
-  };
-  if (backendMode === "local") {
-    childEnv.LETTA_LOCAL_BACKEND_EXPERIMENTAL = "1";
-    if (localBackendStorageDir) {
-      childEnv.LETTA_LOCAL_BACKEND_DIR = localBackendStorageDir;
-    }
-  } else if (backendMode === "api") {
-    childEnv.LETTA_LOCAL_BACKEND_EXPERIMENTAL = "0";
-  }
-  if (launchProfile === "memory-subagent") {
-    const primaryRoot = memoryScope?.primaryRoot ?? inheritedPrimaryRoot;
-    if (primaryRoot) {
-      childEnv.MEMORY_DIR = primaryRoot;
-      childEnv.LETTA_MEMORY_DIR = primaryRoot;
-    } else {
-      delete childEnv.MEMORY_DIR;
-      delete childEnv.LETTA_MEMORY_DIR;
-    }
-  }
-  return childEnv;
-}
-function resolveSubagentInheritedPrimaryRoot(options3) {
-  if (options3.backendMode === "local" && options3.parentAgentId) {
-    return getLocalBackendMemoryFilesystemRoot(options3.parentAgentId, options3.localBackendStorageDir ?? getLocalBackendStorageDir2());
-  }
-  return options3.inheritedPrimaryRoot;
+var init_subagent_stream = __esm(() => {
+  init_subagent_state();
+  init_app_urls();
+  init_debug();
+});
+
+// src/agent/subagents/manager.ts
+import { spawn as spawn8 } from "node:child_process";
+function isProviderNotSupportedError(errorOutput) {
+  return errorOutput.includes("Provider") && errorOutput.includes("is not supported") && errorOutput.includes("supported providers:");
 }
 function getReflectionStartupNotice() {
   return `[Reflection startup context truncated: system prompt + initial message are capped at ~${REFLECTION_STARTUP_CONTEXT_TOKEN_LIMIT.toLocaleString()} estimated tokens. Some parent memory preview content was omitted; read files directly from MEMORY_DIR if needed.]`;
@@ -383257,18 +383433,14 @@ async function spawnSubagent(type3, prompt, userModel, subagentId, signal, exist
   const result = await executeSubagent(type3, config3, model, finalPrompt, baseURL, subagentId, false, signal, existingAgentId, existingConversationId, maxTurns, resolvedParentAgentId, transcriptPath, memoryScope);
   return result;
 }
-var NO_BASE_TOOL_SUBAGENT_TYPES, BYOK_PROVIDER_TO_BASE;
+var NO_BASE_TOOL_SUBAGENT_TYPES;
 var init_manager3 = __esm(() => {
-  init_available_models();
   init_context();
-  init_model();
   init_recall_subagent();
   init_recall_subagent_local();
   init_subagent_state();
   init_sandbox();
   init_backend2();
-  init_metadata();
-  init_paths();
   init_app_urls();
   init_constants2();
   init_cli_permissions_instance();
@@ -383276,26 +383448,18 @@ var init_manager3 = __esm(() => {
   init_session2();
   init_runtime_context();
   init_settings_manager();
-  init_shell_env();
   init_debug();
   init_subagents();
   init_context_budget();
+  init_subagent_launcher();
+  init_subagent_model();
+  init_subagent_stream();
   NO_BASE_TOOL_SUBAGENT_TYPES = new Set([
     "reflection",
     "memory",
     "history-analyzer",
     "init"
   ]);
-  BYOK_PROVIDER_TO_BASE = {
-    "lc-anthropic": "anthropic",
-    "lc-openai": "openai",
-    "lc-zai": "zai",
-    "lc-gemini": "google_ai",
-    "lc-openrouter": "openrouter",
-    "lc-minimax": "minimax",
-    "lc-bedrock": "bedrock",
-    "chatgpt-plus-pro": "chatgpt-plus-pro"
-  };
 });
 
 // src/utils/message-queue-bridge.ts
@@ -391175,21 +391339,13 @@ function providerTypeFromModelSettings(modelSettings) {
   const providerType = modelSettings.provider_type;
   return typeof providerType === "string" ? providerType : null;
 }
-function buildModelHandleFromLlmConfig2(llmConfig) {
-  if (!llmConfig)
-    return null;
-  if (llmConfig.model_endpoint_type && llmConfig.model) {
-    return `${llmConfig.model_endpoint_type}/${llmConfig.model}`;
-  }
-  return llmConfig.model ?? null;
-}
 function getPreferredAgentModelHandle(agent2) {
   if (!agent2)
     return null;
   if (typeof agent2.model === "string" && agent2.model.length > 0) {
     return agent2.model;
   }
-  return buildModelHandleFromLlmConfig2(agent2.llm_config);
+  return resolveModelHandleFromLlmConfig(agent2.llm_config);
 }
 function getToolNamesForToolset(toolsetName, channelToolScope) {
   let tools;
@@ -391601,6 +391757,7 @@ async function switchToolsetForModel(modelIdentifier, agentId, providerType) {
 var ARTIFACT_TOOL_NAMES2, MEMORY_TOOL_NAMES;
 var init_toolset = __esm(async () => {
   init_model();
+  init_model_handles();
   init_backend2();
   init_client2();
   init_plugin_registry();
@@ -393755,6 +393912,67 @@ function mergeSnapshotContentWithExistingToolCalls(snapshotContent, existingCont
 }
 var LOCAL_REPAIRED_TOOL_RESULT_TEXT_MAX_CHARS = 40000;
 
+// src/backend/local/local-model-normalization.ts
+function supportedModelSettingsFromBody(bodyRecord) {
+  const modelSettings = isRecord(bodyRecord.model_settings) ? { ...bodyRecord.model_settings } : {};
+  if (typeof bodyRecord.context_window_limit === "number") {
+    modelSettings.context_window_limit = bodyRecord.context_window_limit;
+  }
+  if (typeof bodyRecord.parallel_tool_calls === "boolean") {
+    modelSettings.parallel_tool_calls = bodyRecord.parallel_tool_calls;
+  }
+  if (typeof bodyRecord.max_tokens === "number" || bodyRecord.max_tokens === null) {
+    modelSettings.max_tokens = bodyRecord.max_tokens;
+  }
+  return modelSettings;
+}
+function providerTypeFromModelSettings2(modelSettings) {
+  const providerType = modelSettings?.provider_type;
+  return typeof providerType === "string" && providerType.length > 0 ? providerType : null;
+}
+function normalizeLocalModelHandle(model, modelSettings, legacyLlmConfig) {
+  const providerType = providerTypeFromModelSettings2(modelSettings);
+  const legacyEndpointType = legacyLlmConfig?.model_endpoint_type;
+  return resolveModelHandleFromLlmConfig({
+    model,
+    model_endpoint_type: providerType ?? (typeof legacyEndpointType === "string" ? legacyEndpointType : null)
+  }) ?? model;
+}
+function modelHandleFromLegacyLlmConfig(legacyLlmConfig) {
+  const model = legacyLlmConfig.model;
+  if (typeof model !== "string")
+    return null;
+  const modelEndpointType = legacyLlmConfig.model_endpoint_type;
+  return resolveModelHandleFromLlmConfig({
+    model,
+    model_endpoint_type: typeof modelEndpointType === "string" ? modelEndpointType : null
+  });
+}
+function supportedConversationModelSettingsFromBody(bodyRecord) {
+  const rawSettings = bodyRecord.model_settings;
+  const modelSettings = rawSettings === null ? null : isRecord(rawSettings) ? { ...rawSettings } : undefined;
+  if (modelSettings === null)
+    return null;
+  const next = modelSettings ?? {};
+  if (typeof bodyRecord.max_tokens === "number" || bodyRecord.max_tokens === null) {
+    next.max_tokens = bodyRecord.max_tokens;
+  }
+  return Object.keys(next).length > 0 ? next : modelSettings;
+}
+function normalizeStoredLocalModelRecord(record5) {
+  if (typeof record5.model !== "string")
+    return record5;
+  const modelSettings = isRecord(record5.model_settings) ? record5.model_settings : {};
+  const normalizedModel = normalizeLocalModelHandle(record5.model, modelSettings);
+  return normalizedModel === record5.model ? record5 : { ...record5, model: normalizedModel };
+}
+function localLlmConfigModelPatch(model, modelSettings) {
+  return mapModelHandleToLlmConfigPatch(model, providerTypeFromModelSettings2(modelSettings));
+}
+var init_local_model_normalization = __esm(() => {
+  init_model_handles();
+});
+
 // src/backend/local/local-stream-chunks.ts
 function attachLocalMessage(target2, message) {
   Object.defineProperty(target2, LOCAL_MESSAGE, {
@@ -393829,19 +394047,6 @@ function optionalString(value) {
 function optionalStringOrNull(value) {
   return typeof value === "string" || value === null ? value : undefined;
 }
-function supportedModelSettingsFromBody(bodyRecord) {
-  const modelSettings = isRecord(bodyRecord.model_settings) ? { ...bodyRecord.model_settings } : {};
-  if (typeof bodyRecord.context_window_limit === "number") {
-    modelSettings.context_window_limit = bodyRecord.context_window_limit;
-  }
-  if (typeof bodyRecord.parallel_tool_calls === "boolean") {
-    modelSettings.parallel_tool_calls = bodyRecord.parallel_tool_calls;
-  }
-  if (typeof bodyRecord.max_tokens === "number" || bodyRecord.max_tokens === null) {
-    modelSettings.max_tokens = bodyRecord.max_tokens;
-  }
-  return modelSettings;
-}
 function createDefaultAgentRecord(agentId, defaultAgentName, defaultAgentModel) {
   return {
     id: agentId,
@@ -393857,14 +394062,16 @@ function createLocalAgentRecord(body, defaultAgentName, defaultAgentModel) {
   const bodyRecord = body;
   const tags = isStringArray2(bodyRecord.tags) ? bodyRecord.tags : [];
   const hidden = normalizeAgentHiddenFlag(bodyRecord.hidden, tags);
+  const modelSettings = supportedModelSettingsFromBody(bodyRecord);
+  const requestedModel = optionalString(bodyRecord.model) ?? defaultAgentModel;
   return {
     id: `agent-local-${randomUUID18()}`,
     name: optionalString(bodyRecord.name) ?? defaultAgentName,
     description: optionalStringOrNull(bodyRecord.description) ?? null,
     system: optionalString(bodyRecord.system) ?? "",
     tags,
-    model: optionalString(bodyRecord.model) ?? defaultAgentModel,
-    model_settings: supportedModelSettingsFromBody(bodyRecord),
+    model: normalizeLocalModelHandle(requestedModel, modelSettings),
+    model_settings: modelSettings,
     ...hidden !== undefined ? { hidden } : {}
   };
 }
@@ -393891,19 +394098,6 @@ function optionalRecordOrNull(value) {
     return null;
   return isRecord(value) ? { ...value } : undefined;
 }
-function conversationModelSettings(value) {
-  return optionalRecordOrNull(value);
-}
-function supportedConversationModelSettingsFromBody(bodyRecord) {
-  const modelSettings = conversationModelSettings(bodyRecord.model_settings);
-  if (modelSettings === null)
-    return null;
-  const next = modelSettings ?? {};
-  if (typeof bodyRecord.max_tokens === "number" || bodyRecord.max_tokens === null) {
-    next.max_tokens = bodyRecord.max_tokens;
-  }
-  return Object.keys(next).length > 0 ? next : modelSettings;
-}
 function createLocalConversationRecord(conversationId, agentId, _sequence, body = {}) {
   const bodyRecord = body;
   const now = currentIsoTimestamp();
@@ -393918,7 +394112,9 @@ function createLocalConversationRecord(conversationId, agentId, _sequence, body
     last_message_at: null,
     summary: optionalStringOrNull(bodyRecord.summary) ?? null,
     in_context_message_ids: [],
-    ...typeof bodyRecord.model === "string" || bodyRecord.model === null ? { model: bodyRecord.model } : {},
+    ...typeof bodyRecord.model === "string" || bodyRecord.model === null ? {
+      model: bodyRecord.model === null ? null : normalizeLocalModelHandle(bodyRecord.model, modelSettings ?? {})
+    } : {},
     ...modelSettings !== undefined ? { model_settings: modelSettings } : {},
     ...typeof bodyRecord.context_window_limit === "number" ? { context_window_limit: bodyRecord.context_window_limit } : {},
     ...typeof bodyRecord.hidden === "boolean" ? { hidden: bodyRecord.hidden } : {}
@@ -393930,6 +394126,7 @@ function updateLocalConversationRecord(current, body, updatedAt) {
     ...current,
     updated_at: updatedAt
   };
+  const modelSettings = supportedConversationModelSettingsFromBody(bodyRecord);
   if (typeof bodyRecord.archived === "boolean") {
     next.archived = bodyRecord.archived;
     next.archived_at = bodyRecord.archived ? current.archived_at ?? updatedAt : null;
@@ -393942,9 +394139,8 @@ function updateLocalConversationRecord(current, body, updatedAt) {
     next.last_message_at = bodyRecord.last_message_at;
   }
   if (typeof bodyRecord.model === "string" || bodyRecord.model === null) {
-    next.model = bodyRecord.model;
+    next.model = bodyRecord.model === null ? null : normalizeLocalModelHandle(bodyRecord.model, modelSettings ?? {});
   }
-  const modelSettings = supportedConversationModelSettingsFromBody(bodyRecord);
   if (modelSettings !== undefined) {
     next.model_settings = modelSettings;
   }
@@ -393973,13 +394169,16 @@ function normalizeAgentRecord(value, defaultAgentModel) {
   const compactionSettings = optionalRecordOrNull(value.compaction_settings);
   const tags = isStringArray2(value.tags) ? value.tags : [];
   const hidden = normalizeAgentHiddenFlag(value.hidden, tags);
+  const storedModel = optionalString(value.model);
+  const legacyModel = modelHandleFromLegacyLlmConfig(legacyLlmConfig);
+  const model = storedModel ? normalizeLocalModelHandle(storedModel, modelSettings, legacyLlmConfig) : legacyModel ?? defaultAgentModel;
   return {
     id: value.id,
     name: optionalString(value.name) ?? "Letta Code",
     description: optionalStringOrNull(value.description) ?? null,
     system: optionalString(value.system) ?? "",
     tags,
-    model: optionalString(value.model) ?? optionalString(legacyLlmConfig.model) ?? defaultAgentModel,
+    model,
     model_settings: modelSettings,
     ...hidden !== undefined ? { hidden } : {},
     ...compactionSettings !== undefined ? { compaction_settings: compactionSettings } : {}
@@ -393990,6 +394189,7 @@ function projectLocalAgentState(record5, messageIds = [], inContextMessageIds =
   const nestedReasoning = isRecord(record5.model_settings.reasoning) ? record5.model_settings.reasoning : undefined;
   const reasoningEffort = typeof nestedReasoning?.reasoning_effort === "string" ? nestedReasoning.reasoning_effort : typeof record5.model_settings.effort === "string" ? record5.model_settings.effort : typeof record5.model_settings.reasoning_effort === "string" ? record5.model_settings.reasoning_effort : undefined;
   const enableReasoner = isRecord(record5.model_settings.thinking) && record5.model_settings.thinking.type === "disabled" ? false : typeof record5.model_settings.enable_reasoner === "boolean" ? record5.model_settings.enable_reasoner : undefined;
+  const llmConfigModelPatch = localLlmConfigModelPatch(record5.model, record5.model_settings);
   return {
     id: record5.id,
     name: record5.name,
@@ -394005,8 +394205,7 @@ function projectLocalAgentState(record5, messageIds = [], inContextMessageIds =
     in_context_message_ids: inContextMessageIds,
     ...lastRunCompletion ? { last_run_completion: lastRunCompletion } : {},
     llm_config: {
-      model: record5.model,
-      model_endpoint_type: "openai",
+      ...llmConfigModelPatch,
       model_endpoint: "https://example.invalid/v1",
       context_window: typeof record5.model_settings.context_window_limit === "number" ? record5.model_settings.context_window_limit : 128000,
       ...reasoningEffort && { reasoning_effort: reasoningEffort },
@@ -394521,12 +394720,13 @@ class LocalStore {
     const nextSystem = typeof bodyRecord.system === "string" ? bodyRecord.system : undefined;
     const systemChanged = nextSystem !== undefined && nextSystem !== existingRecord.system;
     const requestedModel = bodyRecord.model;
-    const nextModel = typeof requestedModel === "string" && !shouldUseDefaultLocalModel(requestedModel) ? requestedModel : typeof requestedModel === "string" && this.defaultAgentModel ? this.defaultAgentModel : undefined;
+    const requestedModelSettings = supportedModelSettingsFromBody(bodyRecord);
+    const nextModel = typeof requestedModel === "string" && !shouldUseDefaultLocalModel(requestedModel) ? normalizeLocalModelHandle(requestedModel, requestedModelSettings) : typeof requestedModel === "string" && this.defaultAgentModel ? this.defaultAgentModel : undefined;
     const modelChanged = nextModel !== undefined && nextModel !== existingRecord.model;
     const nextModelDefaults = nextModel ? this.modelSettingsDefaultsForModel(nextModel) : undefined;
     const nextModelSettings = {
       ...modelChanged ? {} : existingRecord.model_settings,
-      ...supportedModelSettingsFromBody(bodyRecord),
+      ...requestedModelSettings,
       ...modelChanged ? nextModelDefaults ?? {} : {}
     };
     const updated = {
@@ -394687,9 +394887,10 @@ class LocalStore {
     const requestedModel = body.model;
     if (typeof requestedModel !== "string")
       return conversation;
-    if (previousConversation.model === requestedModel)
+    const normalizedRequestedModel = normalizeLocalModelHandle(requestedModel, isRecord(conversation.model_settings) ? conversation.model_settings : {});
+    if (previousConversation.model === normalizedRequestedModel)
       return conversation;
-    const defaults5 = this.modelSettingsDefaultsForModel(requestedModel);
+    const defaults5 = this.modelSettingsDefaultsForModel(normalizedRequestedModel);
     if (!defaults5 || Object.keys(defaults5).length === 0)
       return conversation;
     const existingSettings = isRecord(conversation.model_settings) ? conversation.model_settings : {};
@@ -395593,9 +395794,10 @@ class LocalStore {
     const existing = this.conversations.get(key);
     if (existing && options3.forceRefresh !== true)
       return existing;
+    const normalizedInput = normalizeStoredLocalModelRecord(input);
     const timing = transcriptTimingForConversationDir(conversationDir);
-    const requiresFullTimestampRepair = isSyntheticLocalTimestamp(input.created_at) || isSyntheticLocalTimestamp(input.updated_at) || isSyntheticLocalTimestamp(input.last_message_at);
-    const conversation = requiresFullTimestampRepair ? input : repairSyntheticConversationTimestamps(input, [], timing);
+    const requiresFullTimestampRepair = isSyntheticLocalTimestamp(normalizedInput.created_at) || isSyntheticLocalTimestamp(normalizedInput.updated_at) || isSyntheticLocalTimestamp(normalizedInput.last_message_at);
+    const conversation = requiresFullTimestampRepair ? normalizedInput : repairSyntheticConversationTimestamps(normalizedInput, [], timing);
     let compiledSystemPrompt;
     try {
       compiledSystemPrompt = readJsonFile2(join39(conversationDir, "system-prompt.json"));
@@ -396012,6 +396214,7 @@ class LocalStore {
 var DEFAULT_LOCAL_AGENT_NAME = "Letta Code", DEFAULT_LOCAL_MODEL = "local/default", LEGACY_LOCAL_CONTEXT_WINDOW_LIMIT = 128000, DEFAULT_LOCAL_CONVERSATION_ID_PREFIX = "local-conv-", DEFAULT_LOCAL_STORED_MESSAGE_ID_PREFIX = "letta-msg-", DEFAULT_LOCAL_UI_MESSAGE_ID_PREFIX = "ui-msg-", LocalBackendNotFoundError, LOCAL_TRANSCRIPT_LEGACY_SCHEMA_VERSION = 1, LOCAL_TRANSCRIPT_SCHEMA_VERSION = 2, LOCAL_TRANSCRIPT_LEGACY_MESSAGE_FORMAT = "pi-ai-message-jsonl", LOCAL_TRANSCRIPT_MESSAGE_FORMAT = "pi-session-entry-jsonl", LOCAL_TRANSCRIPT_PROVIDER_STACK = "pi-ai", LocalTranscriptMigrationRequiredError, LocalTranscriptRepairRequiredError;
 var init_local_store = __esm(() => {
   init_constants2();
+  init_local_model_normalization();
   init_local_stream_chunks();
   LocalBackendNotFoundError = class LocalBackendNotFoundError extends Error {
     status = 404;
@@ -397462,13 +397665,13 @@ function localStopReasonChunk(stopReason) {
 }
 function effectiveAgentForConversation(agent2, conversation) {
   const conversationRecord = conversation;
-  const conversationModelSettings2 = isRecord(conversationRecord.model_settings) ? conversationRecord.model_settings : undefined;
+  const conversationModelSettings = isRecord(conversationRecord.model_settings) ? conversationRecord.model_settings : undefined;
   return {
     ...agent2,
     ...typeof conversationRecord.model === "string" ? { model: conversationRecord.model } : {},
     model_settings: {
       ...agent2.model_settings,
-      ...conversationModelSettings2 ?? {},
+      ...conversationModelSettings ?? {},
       ...typeof conversationRecord.context_window_limit === "number" ? { context_window_limit: conversationRecord.context_window_limit } : {}
     }
   };
@@ -397599,11 +397802,12 @@ class HeadlessBackend {
     };
   }
   async listModels() {
+    const llmConfigPatch = mapModelHandleToLlmConfigPatch(this.modelHandle);
     return [
       {
         handle: this.modelHandle,
-        model: this.modelHandle,
-        model_endpoint_type: "openai"
+        model: llmConfigPatch.model ?? this.modelHandle,
+        model_endpoint_type: llmConfigPatch.model_endpoint_type ?? "openai"
       }
     ];
   }
@@ -397855,6 +398059,7 @@ class HeadlessBackend {
 }
 var FAKE_HEADLESS_MODEL = "dev/fake-headless";
 var init_fake_headless_backend = __esm(() => {
+  init_model_handles();
   init_local_store();
   init_local_stream_chunks();
   init_constants2();
@@ -397991,6 +398196,15 @@ var init_registered_pi_provider_runtime = __esm(() => {
 function isUnselectedLocalModelHandle(model) {
   return typeof model !== "string" || model.length === 0 || model === "auto" || model === UNSELECTED_LOCAL_MODEL_HANDLE || model.startsWith("letta/");
 }
+function normalizeOpenAICompatibleLocalModelHandle(model) {
+  if (!model?.startsWith("openai/"))
+    return model;
+  const nestedHandle = model.slice("openai/".length);
+  const nestedProvider = resolveProviderFromModelHandle(nestedHandle);
+  if (!nestedProvider)
+    return model;
+  return getPiProviderSpec(nestedProvider).localModelDiscovery === "openai-compatible" ? nestedHandle : model;
+}
 function settingString(value) {
   return typeof value === "string" && value.length > 0 ? value : undefined;
 }
@@ -398248,7 +398462,7 @@ function bedrockLocalProviderOptions(record5) {
   };
 }
 async function resolvePiModelForAgent(modelHandle, modelSettings = {}, options3 = {}) {
-  const concreteModelHandle = isUnselectedLocalModelHandle(modelHandle) ? undefined : modelHandle;
+  const concreteModelHandle = normalizeOpenAICompatibleLocalModelHandle(isUnselectedLocalModelHandle(modelHandle) ? undefined : modelHandle);
   const provider = options3.provider ? resolvePiProvider(options3.provider) : resolvePiProviderFromAgent(concreteModelHandle, modelSettings);
   const registeredProvider = getRegisteredPiProvider(provider);
   const spec = isPiProvider(provider) ? getPiProviderSpec(provider) : undefined;
@@ -398612,6 +398826,10 @@ async function resolveAvailableLocalModelForTurn(input) {
     }
   };
 }
+function shouldIncludeLocalModel(provider, model) {
+  const modelId = isPiProvider(provider) ? stripProviderHandlePrefix(model, provider) ?? model : model;
+  return !(localProviderTypeForModelConfig(provider) === "chatgpt_oauth" && UNSUPPORTED_LOCAL_CHATGPT_OAUTH_MODELS.has(modelId));
+}
 async function listLocalModels(storageDir, options3 = {}) {
   const records = listLocalProviderRecords(storageDir);
   const providerNames = localProviderNamesFromRecords(records);
@@ -398620,6 +398838,8 @@ async function listLocalModels(storageDir, options3 = {}) {
   const registeredProviders2 = listRegisteredPiProviders();
   const registeredProvidersWithModels = new Set(registeredProviders2.filter((provider) => provider.config.models !== undefined).map((provider) => provider.providerName));
   const addModel = (provider, model, options4 = {}) => {
+    if (!shouldIncludeLocalModel(provider, model))
+      return;
     const handle = options4.handle ?? (typeof provider === "string" && !isPiProviderForLocalModelHandle(provider) ? `${provider}/${model}` : localModelHandle(provider, model));
     if (models3.some((entry) => entry.handle === handle))
       return;
@@ -398692,7 +398912,7 @@ async function listLocalModels(storageDir, options3 = {}) {
   }
   return models3;
 }
-var LOCAL_MODEL_DISCOVERY_TIMEOUT_MS = 2000, LOCAL_MODEL_AUTODETECT_DISCOVERY_TIMEOUT_MS = 500;
+var LOCAL_MODEL_DISCOVERY_TIMEOUT_MS = 2000, LOCAL_MODEL_AUTODETECT_DISCOVERY_TIMEOUT_MS = 500, UNSUPPORTED_LOCAL_CHATGPT_OAUTH_MODELS;
 var init_local_model_config = __esm(() => {
   init_compat2();
   init_pi_model_factory();
@@ -398700,6 +398920,25 @@ var init_local_model_config = __esm(() => {
   init_pi_provider_registry();
   init_registered_pi_provider_runtime();
   init_local_provider_auth_store();
+  UNSUPPORTED_LOCAL_CHATGPT_OAUTH_MODELS = new Set(["gpt-5.6-luna"]);
+});
+
+// src/backend/dev/pi-output-budget.ts
+function assertViablePiOutputBudget(model, context3, requestedMaxTokens) {
+  if (model.provider !== "llama-cpp")
+    return;
+  const requested = requestedMaxTokens ?? model.maxTokens;
+  if (!Number.isFinite(requested) || requested <= 0)
+    return;
+  const clamped = clampMaxTokensToContext(model, context3, requested);
+  const minimum3 = Math.min(requested, MIN_VIABLE_OUTPUT_TOKENS);
+  if (clamped >= minimum3)
+    return;
+  throw new Error(`Context window of ${model.contextWindow} tokens leaves only ${clamped} output token${clamped === 1 ? "" : "s"}; at least ${minimum3} are required. Compact the conversation or increase the context window.`);
+}
+var MIN_VIABLE_OUTPUT_TOKENS = 1024;
+var init_pi_output_budget = __esm(() => {
+  init_simple_options();
 });
 
 // src/backend/local/local-context-estimate.ts
@@ -399546,6 +399785,7 @@ class PiStreamAdapter {
         messageCount: context3.messages.length,
         contextWindow: resolved.model.contextWindow
       });
+      assertViablePiOutputBudget(resolved.model, context3, options3.maxTokens);
       const result = this.runStream(resolved.model, context3, options3);
       let streamError;
       let finalMessage;
@@ -399686,6 +399926,7 @@ var init_pi_stream_adapter = __esm(() => {
   init_context_window_overflow();
   init_local_provider_errors();
   init_pi_model_factory();
+  init_pi_output_budget();
   init_provider_turn_executor();
   LOCAL_PROVIDER_ADAPTIVE_IMAGE_ELISION_AFTER_RETRIES = LOCAL_PROVIDER_MAX_RETRIES - 1;
   PiProviderError = class PiProviderError extends Error {
@@ -400818,9 +401059,9 @@ var init_local_backend = __esm(() => {
       if (typeof conversation.context_window_limit === "number") {
         return conversation.context_window_limit;
       }
-      const conversationModelSettings2 = conversation.model_settings;
-      if (conversationModelSettings2 && typeof conversationModelSettings2 === "object" && !Array.isArray(conversationModelSettings2) && typeof conversationModelSettings2.context_window_limit === "number") {
-        return conversationModelSettings2.context_window_limit;
+      const conversationModelSettings = conversation.model_settings;
+      if (conversationModelSettings && typeof conversationModelSettings === "object" && !Array.isArray(conversationModelSettings) && typeof conversationModelSettings.context_window_limit === "number") {
+        return conversationModelSettings.context_window_limit;
       }
       const agent2 = this.store.retrieveAgentRecord(agentId);
       return typeof agent2.model_settings.context_window_limit === "number" ? agent2.model_settings.context_window_limit : undefined;
@@ -400829,17 +401070,17 @@ var init_local_backend = __esm(() => {
       const agent2 = this.store.retrieveAgentRecord(agentId);
       const conversation = this.store.retrieveConversation(conversationId, agentId);
       const model = typeof conversation.model === "string" ? conversation.model : undefined;
-      const conversationModelSettings2 = isRecord(conversation.model_settings) ? conversation.model_settings : undefined;
-      if (model === undefined && conversationModelSettings2 === undefined) {
+      const conversationModelSettings = isRecord(conversation.model_settings) ? conversation.model_settings : undefined;
+      if (model === undefined && conversationModelSettings === undefined) {
         return agent2;
       }
       return {
         ...agent2,
         ...model !== undefined ? { model } : {},
-        ...conversationModelSettings2 !== undefined ? {
+        ...conversationModelSettings !== undefined ? {
           model_settings: {
             ...agent2.model_settings,
-            ...conversationModelSettings2
+            ...conversationModelSettings
           }
         } : {}
       };
@@ -401260,10 +401501,13 @@ var init_backend2 = __esm(() => {
 var exports_model2 = {};
 __export(exports_model2, {
   shouldPreserveContextWindowForModelSelection: () => shouldPreserveContextWindowForModelSelection2,
+  resolveModelHandleFromLlmConfig: () => resolveModelHandleFromLlmConfig,
   resolveModelByLlmConfig: () => resolveModelByLlmConfig2,
   resolveModel: () => resolveModel,
-  normalizeModelHandleForRegistry: () => normalizeModelHandleForRegistry2,
+  normalizeModelHandleForRegistry: () => normalizeModelHandleForRegistry,
+  normalizeKnownModelHandle: () => normalizeKnownModelHandle,
   models: () => models2,
+  mapModelHandleToLlmConfigPatch: () => mapModelHandleToLlmConfigPatch,
   isLocalModelHandle: () => isLocalModelHandle2,
   isLocalChatGptOAuthModelHandle: () => isLocalChatGptOAuthModelHandle2,
   getResumeRefreshArgs: () => getResumeRefreshArgs2,
@@ -401282,49 +401526,27 @@ __export(exports_model2, {
   CHATGPT_FAST_SERVICE_TIER: () => CHATGPT_FAST_SERVICE_TIER2
 });
 function isLocalModelHandle2(modelHandle) {
-  return LOCAL_MODEL_HANDLE_PREFIXES2.some((prefix) => modelHandle.startsWith(prefix));
+  return LOCAL_MODEL_HANDLE_PREFIXES.some((prefix) => modelHandle.startsWith(prefix));
 }
 function getLocalModelLabel2(modelHandle) {
-  const providerPrefix = LOCAL_MODEL_HANDLE_PREFIXES2.find((prefix) => modelHandle.startsWith(prefix));
-  return providerPrefix ? modelHandle.slice(providerPrefix.length) : modelHandle;
+  const providerPrefix2 = LOCAL_MODEL_HANDLE_PREFIXES.find((prefix) => modelHandle.startsWith(prefix));
+  return providerPrefix2 ? modelHandle.slice(providerPrefix2.length) : 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 && model.length > 0) {
-    return `${OPENAI_CODEX_PROVIDER_NAME}/${model}`;
-  }
-  if (provider === LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX2.slice(0, -1) && model.length > 0 && !model.endsWith("-fast")) {
-    return `${OPENAI_CODEX_PROVIDER_NAME}/${model}`;
-  }
-  if (provider === "lc-anthropic" && model.length > 0) {
-    return `anthropic/${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);
+  return modelHandle.startsWith(LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX);
 }
 function getChatGptFastRegistryHandleForModelHandle2(modelHandle) {
   const [provider] = modelHandle.split("/");
-  if (provider !== LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX2.slice(0, -1) && provider !== CHATGPT_OAUTH_LLM_CONFIG_PROVIDER2 && provider !== OPENAI_CODEX_PROVIDER_NAME) {
+  if (provider !== LOCAL_CHATGPT_OAUTH_HANDLE_PREFIX.slice(0, -1) && provider !== CHATGPT_OAUTH_LLM_CONFIG_PROVIDER && provider !== OPENAI_CODEX_PROVIDER_NAME) {
     return null;
   }
-  const normalized = normalizeModelHandleForRegistry2(modelHandle);
+  const normalized = normalizeModelHandleForRegistry(modelHandle);
   if (!normalized?.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`))
     return null;
-  const model = modelPortion2(normalized);
+  const model = modelPortionFromHandle(normalized);
   if (!model || model.endsWith("-fast"))
     return null;
   const fastHandle = `${OPENAI_CODEX_PROVIDER_NAME}/${model}-fast`;
@@ -401334,11 +401556,11 @@ function displayRegistryHandleForServiceTier2(modelHandle, serviceTier) {
   if (serviceTier === CHATGPT_FAST_SERVICE_TIER2) {
     return getChatGptFastRegistryHandleForModelHandle2(modelHandle) ?? modelHandle;
   }
-  return normalizeModelHandleForRegistry2(modelHandle) ?? modelHandle;
+  return normalizeModelHandleForRegistry(modelHandle) ?? modelHandle;
 }
 function getReasoningTierOptionsForHandle2(modelHandle, contextWindow) {
   const byEffort = new Map;
-  const registryHandle = normalizeModelHandleForRegistry2(modelHandle) ?? modelHandle;
+  const registryHandle = normalizeModelHandleForRegistry(modelHandle) ?? modelHandle;
   const effectiveContextWindow = contextWindow ?? (() => {
     const contextWindows = models2.filter((model) => model.handle === registryHandle).map((model) => model.updateArgs?.context_window).filter((value) => typeof value === "number");
     const uniqueContextWindows = [...new Set(contextWindows)];
@@ -401381,7 +401603,7 @@ function getModelInfo2(modelIdentifier) {
   const byId = models2.find((m2) => m2.id === modelIdentifier);
   if (byId)
     return byId;
-  const normalizedHandle = normalizeModelHandleForRegistry2(modelIdentifier);
+  const normalizedHandle = normalizeModelHandleForRegistry(modelIdentifier);
   const byHandle = models2.find((m2) => m2.handle === normalizedHandle);
   if (byHandle)
     return byHandle;
@@ -401433,8 +401655,8 @@ function buildModelHandleFromConfig2(config3) {
   return config3.model ?? null;
 }
 function shouldPreserveContextWindowForModelSelection2(input) {
-  const currentRegistryModelHandle = normalizeModelHandleForRegistry2(input.currentModelHandle ?? buildModelHandleFromConfig2(input.currentLlmConfig));
-  const selectedRegistryModelHandle = normalizeModelHandleForRegistry2(input.selectedModelHandle);
+  const currentRegistryModelHandle = normalizeModelHandleForRegistry(input.currentModelHandle ?? buildModelHandleFromConfig2(input.currentLlmConfig));
+  const selectedRegistryModelHandle = normalizeModelHandleForRegistry(input.selectedModelHandle);
   if (selectedRegistryModelHandle === null || selectedRegistryModelHandle !== currentRegistryModelHandle) {
     return false;
   }
@@ -401492,23 +401714,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 registryHandle = normalizeModelHandleForRegistry2(handle) ?? handle;
+  const registryHandle = normalizeModelHandleForRegistry(handle) ?? handle;
   const exactMatch = models2.find((m2) => m2.handle === registryHandle);
   if (exactMatch)
     return exactMatch;
   const [provider, ...rest3] = registryHandle.split("/");
   if (provider && rest3.length > 0) {
-    const modelPortion3 = rest3.join("/");
+    const modelPortion = 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(modelPortion3) || modelPortion3.includes(mModelPortion);
+      return mModelPortion.includes(modelPortion) || modelPortion.includes(mModelPortion);
     });
     const providerMatch = pickPreferred(providerMatches);
     if (providerMatch)
       return providerMatch;
-    const suffixMatches = models2.filter((m2) => m2.handle.endsWith(`/${modelPortion3}`));
+    const suffixMatches = models2.filter((m2) => m2.handle.endsWith(`/${modelPortion}`));
     const suffixMatch = pickPreferred(suffixMatches);
     if (suffixMatch)
       return suffixMatch;
@@ -401537,10 +401759,11 @@ function resolveModelByLlmConfig2(llmConfigModel) {
     return exactMatch.id;
   return null;
 }
-var 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 REASONING_EFFORT_ORDER2, LOCAL_REASONING_EFFORT_ORDER2, CHATGPT_FAST_SERVICE_TIER2 = "priority", RESUME_REFRESH_FIELDS2;
 var init_model2 = __esm(() => {
-  init_openai_codex_provider();
   init_model_catalog();
+  init_model_handles();
+  init_model_handles();
   REASONING_EFFORT_ORDER2 = [
     "none",
     "minimal",
@@ -401556,13 +401779,6 @@ var init_model2 = __esm(() => {
     "medium",
     "high"
   ];
-  LOCAL_MODEL_HANDLE_PREFIXES2 = [
-    "ollama/",
-    "ollama-cloud/",
-    "lmstudio/",
-    "llama.cpp/",
-    "llama-cpp/"
-  ];
   RESUME_REFRESH_FIELDS2 = [
     "max_output_tokens",
     "parallel_tool_calls"
@@ -445436,9 +445652,9 @@ async function applySetMaxContext(params) {
   });
   const updatedConversationRecord = updatedConversation;
   const conversationModel = typeof updatedConversationRecord.model === "string" ? updatedConversationRecord.model : typeof conversationRecord.model === "string" ? conversationRecord.model : null;
-  const conversationModelSettings2 = nonEmptyModelSettings(updatedConversationRecord.model_settings) ?? nonEmptyModelSettings(conversationRecord.model_settings);
+  const conversationModelSettings = nonEmptyModelSettings(updatedConversationRecord.model_settings) ?? nonEmptyModelSettings(conversationRecord.model_settings);
   const agentModelHandle = typeof agent2.model === "string" && agent2.model.length > 0 ? agent2.model : buildModelHandleFromConfig3(agent2.llm_config);
-  const inheritedModelSettings = conversationModelSettings2 ?? (conversationModel === null || conversationModel === agentModelHandle ? agent2.model_settings ?? null : null);
+  const inheritedModelSettings = conversationModelSettings ?? (conversationModel === null || conversationModel === agentModelHandle ? agent2.model_settings ?? null : null);
   return {
     contextWindow,
     reset,
@@ -459331,7 +459547,7 @@ function buildModelHandleFromConfig4(config3) {
   }
   return config3.model ?? null;
 }
-function providerTypeFromModelSettings2(modelSettings) {
+function providerTypeFromModelSettings3(modelSettings) {
   const providerType = modelSettings?.provider_type;
   return typeof providerType === "string" ? providerType : null;
 }
@@ -459508,7 +459724,7 @@ async function applyModelUpdateForRuntime(params) {
       agentId,
       conversationId,
       overrideModel: model.handle,
-      overrideProviderType: providerTypeFromModelSettings2(modelSettings) ?? inferProviderTypeFromRegistryHandle(model.handle) ?? null,
+      overrideProviderType: providerTypeFromModelSettings3(modelSettings) ?? inferProviderTypeFromRegistryHandle(model.handle) ?? null,
       modEvents: ensureListenerModAdapter(listener).events
     });
     nextToolset = preparedToolContext.toolset;
@@ -477197,7 +477413,7 @@ var init_build7 = __esm(async () => {
 
 // src/agent/conversation-model-carryover.ts
 function normalizeConversationModelCarryoverHandle(rawModelHandle) {
-  return normalizeModelHandleForRegistry(rawModelHandle) ?? rawModelHandle;
+  return normalizeKnownModelHandle(rawModelHandle);
 }
 function buildConversationModelCarryoverUpdate(params) {
   const { rawModelHandle, currentLlmConfig } = params;
@@ -477235,6 +477451,7 @@ function buildConversationModelCarryoverUpdate(params) {
 }
 var init_conversation_model_carryover = __esm(() => {
   init_model();
+  init_model_handles();
 });
 
 // src/agent/reconcile-existing-agent-state.ts
@@ -522548,13 +522765,8 @@ function inferReasoningEffortFromModelPreset(modelId, modelHandle) {
   }
   return null;
 }
-function buildModelHandleFromLlmConfig3(llmConfig) {
-  if (!llmConfig)
-    return null;
-  if (llmConfig.model_endpoint_type && llmConfig.model) {
-    return `${llmConfig.model_endpoint_type}/${llmConfig.model}`;
-  }
-  return llmConfig.model ?? null;
+function buildModelHandleFromLlmConfig(llmConfig) {
+  return resolveModelHandleFromLlmConfig(llmConfig);
 }
 function getPreferredAgentModelHandle2(agent2) {
   if (!agent2)
@@ -522562,9 +522774,9 @@ function getPreferredAgentModelHandle2(agent2) {
   if (typeof agent2.model === "string" && agent2.model.length > 0) {
     return agent2.model;
   }
-  return buildModelHandleFromLlmConfig3(agent2.llm_config);
+  return buildModelHandleFromLlmConfig(agent2.llm_config);
 }
-function providerTypeFromModelSettings3(modelSettings) {
+function providerTypeFromModelSettings4(modelSettings) {
   if (typeof modelSettings !== "object" || modelSettings === null || !("provider_type" in modelSettings)) {
     return null;
   }
@@ -522576,35 +522788,7 @@ function providerTypeFromUpdateArgs(updateArgs) {
   return typeof providerType === "string" && providerType.length > 0 ? providerType : null;
 }
 function mapHandleToLlmConfigPatch(modelHandle, providerType) {
-  const [provider, ...modelParts] = modelHandle.split("/");
-  const modelName = modelParts.join("/");
-  if (!provider || !modelName) {
-    return {
-      model: modelHandle
-    };
-  }
-  const knownEndpointTypes = new Set([
-    "anthropic",
-    "bedrock",
-    "chatgpt_oauth",
-    "google_ai",
-    "google_vertex",
-    "minimax",
-    "moonshot",
-    "moonshot_coding",
-    "openai",
-    "openrouter",
-    "zai",
-    "zai_coding"
-  ]);
-  const endpointType = typeof providerType === "string" && providerType.length > 0 ? providerType : provider === OPENAI_CODEX_PROVIDER_NAME || provider === "openai-codex" ? "chatgpt_oauth" : knownEndpointTypes.has(provider) ? provider : null;
-  if (!endpointType) {
-    return { model: modelHandle };
-  }
-  return {
-    model: modelName,
-    model_endpoint_type: endpointType
-  };
+  return mapModelHandleToLlmConfigPatch(modelHandle, providerType);
 }
 function getErrorHintForStopReason(stopReason, currentModelId, modelEndpointType) {
   if (stopReason !== "llm_api_error") {
@@ -522625,7 +522809,7 @@ function getErrorHintForStopReason(stopReason, currentModelId, modelEndpointType
 }
 var init_model_config = __esm(() => {
   init_model();
-  init_openai_codex_provider();
+  init_model_handles();
   init_constants7();
 });
 
@@ -523722,11 +523906,11 @@ function useConfigurationHandlers(ctx) {
       const {
         getChatGptFastRegistryHandleForModelHandle: getChatGptFastRegistryHandleForModelHandle3,
         getReasoningTierOptionsForHandle: getReasoningTierOptionsForHandle3,
-        normalizeModelHandleForRegistry: normalizeModelHandleForRegistry3,
+        normalizeModelHandleForRegistry: normalizeModelHandleForRegistry2,
         models: models3
       } = await Promise.resolve().then(() => (init_model(), exports_model));
       const pickPreferredModelForHandle = (handle2) => {
-        const registryHandle2 = normalizeModelHandleForRegistry3(handle2) ?? handle2;
+        const registryHandle2 = normalizeModelHandleForRegistry2(handle2) ?? handle2;
         const candidates2 = models3.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;
       };
@@ -523771,7 +523955,7 @@ function useConfigurationHandlers(ctx) {
             ...handleMatch,
             id: modelId,
             handle: modelId,
-            registryHandle: normalizeModelHandleForRegistry3(registryCandidate) ?? registryCandidate,
+            registryHandle: normalizeModelHandleForRegistry2(registryCandidate) ?? registryCandidate,
             updateArgs: Object.keys(updateArgs).length > 0 ? updateArgs : undefined
           };
         }
@@ -523810,7 +523994,7 @@ function useConfigurationHandlers(ctx) {
       }
       const model2 = selectedModel;
       const modelHandle = model2.handle ?? model2.id;
-      const registryHandle = model2.registryHandle ?? normalizeModelHandleForRegistry3(modelHandle) ?? modelHandle;
+      const registryHandle = model2.registryHandle ?? normalizeModelHandleForRegistry2(modelHandle) ?? modelHandle;
       const modelUpdateArgs = model2.updateArgs;
       const rawReasoningEffort = modelUpdateArgs?.reasoning_effort;
       const usesDistinctXHighLabel = /Fable 5|Opus 4\.[78]|GPT-5\.6/.test(model2.label);
@@ -523885,7 +524069,7 @@ function useConfigurationHandlers(ctx) {
           phase: "running"
         });
         const isDefaultConversation = conversationIdRef.current === "default";
-        let conversationModelSettings2;
+        let conversationModelSettings;
         let conversationContextWindowLimit;
         let updatedAgent = null;
         if (isDefaultConversation) {
@@ -523893,17 +524077,17 @@ function useConfigurationHandlers(ctx) {
           updatedAgent = await updateAgentLLMConfig3(agentIdRef.current, modelHandle, modelUpdateArgsForRequest, {
             avoidOverwritingExistingContextWindow: shouldPreserveContextWindow
           });
-          conversationModelSettings2 = updatedAgent?.model_settings;
+          conversationModelSettings = updatedAgent?.model_settings;
         } else {
           const { updateConversationLLMConfig: updateConversationLLMConfig2 } = await Promise.resolve().then(() => (init_modify(), exports_modify));
           const updatedConversation = await updateConversationLLMConfig2(conversationIdRef.current, modelHandle, modelUpdateArgsForRequest, {
             avoidOverwritingExistingContextWindow: shouldPreserveContextWindow
           });
-          conversationModelSettings2 = updatedConversation.model_settings;
+          conversationModelSettings = updatedConversation.model_settings;
           conversationContextWindowLimit = updatedConversation.context_window_limit;
         }
         const rawEffort = modelUpdateArgs?.reasoning_effort;
-        const resolvedReasoningEffort = typeof rawEffort === "string" ? rawEffort : deriveReasoningEffort(conversationModelSettings2, llmConfigRef.current) ?? null;
+        const resolvedReasoningEffort = typeof rawEffort === "string" ? rawEffort : deriveReasoningEffort(conversationModelSettings, llmConfigRef.current) ?? null;
         if (isDefaultConversation) {
           setHasConversationModelOverride(false);
           setConversationOverrideModelSettings(null);
@@ -523913,12 +524097,12 @@ function useConfigurationHandlers(ctx) {
           }
         } else {
           setHasConversationModelOverride(true);
-          setConversationOverrideModelSettings(conversationModelSettings2 ?? null);
+          setConversationOverrideModelSettings(conversationModelSettings ?? null);
         }
         const presetContextWindow = modelUpdateArgsForRequest?.context_window;
         const preservedContextWindow = llmConfigRef.current?.context_window;
         const resolvedContextWindow = typeof conversationContextWindowLimit === "number" ? conversationContextWindowLimit : shouldPreserveContextWindow && typeof preservedContextWindow === "number" ? preservedContextWindow : typeof presetContextWindow === "number" ? presetContextWindow : undefined;
-        const resolvedProviderType = providerTypeFromModelSettings3(conversationModelSettings2) ?? providerTypeFromUpdateArgs(modelUpdateArgsForRequest) ?? providerTypeFromUpdateArgs(modelUpdateArgs);
+        const resolvedProviderType = providerTypeFromModelSettings4(conversationModelSettings) ?? providerTypeFromUpdateArgs(modelUpdateArgsForRequest) ?? providerTypeFromUpdateArgs(modelUpdateArgs);
         if (!isDefaultConversation) {
           setConversationOverrideContextWindowLimit(typeof resolvedContextWindow === "number" ? resolvedContextWindow : null);
         }
@@ -524312,7 +524496,7 @@ ${guidance}`);
           if (!modelHandle) {
             throw new Error("Could not determine current model for auto toolset");
           }
-          const providerType = providerTypeFromModelSettings3(agentState?.model_settings) ?? llmConfig?.model_endpoint_type ?? null;
+          const providerType = providerTypeFromModelSettings4(agentState?.model_settings) ?? llmConfig?.model_endpoint_type ?? null;
           const derivedToolset = await switchToolsetForModel2(modelHandle, agentId, providerType);
           settingsManager.setToolsetPreference(agentId, "auto");
           setCurrentToolsetPreference("auto");
@@ -527222,7 +527406,7 @@ function resolveReasoningCycleTierLookupHandle(modelHandle, modelSettings) {
   if (isLocalModelHandle(modelHandle)) {
     return modelHandle;
   }
-  const providerType = providerTypeFromModelSettings3(modelSettings);
+  const providerType = providerTypeFromModelSettings4(modelSettings);
   const modelName = modelNameFromHandle(modelHandle);
   if (!providerType || !modelName) {
     return normalizedHandle ?? modelHandle;
@@ -527290,7 +527474,7 @@ function useReasoningCycle(ctx) {
         const cmd = commandRunner.start("/reasoning", "Setting reasoning...");
         try {
           const isDefaultConversation = conversationIdRef.current === "default";
-          let conversationModelSettings2;
+          let conversationModelSettings;
           let conversationContextWindowLimit;
           let updatedAgent = null;
           if (isDefaultConversation) {
@@ -527307,10 +527491,10 @@ function useReasoningCycle(ctx) {
               ...desired.providerType ? { provider_type: desired.providerType } : {},
               ...desired.serviceTier !== undefined ? { service_tier: desired.serviceTier } : {}
             }, { avoidOverwritingExistingContextWindow: true });
-            conversationModelSettings2 = updatedConversation.model_settings;
+            conversationModelSettings = updatedConversation.model_settings;
             conversationContextWindowLimit = updatedConversation.context_window_limit;
           }
-          const resolvedReasoningEffort = deriveReasoningEffort(isDefaultConversation ? updatedAgent?.model_settings ?? null : conversationModelSettings2, llmConfigRef.current) ?? desired.effort;
+          const resolvedReasoningEffort = deriveReasoningEffort(isDefaultConversation ? updatedAgent?.model_settings ?? null : conversationModelSettings, llmConfigRef.current) ?? desired.effort;
           const resolvedConversationContextWindowLimit = conversationContextWindowLimit === undefined ? typeof llmConfigRef.current?.context_window === "number" ? llmConfigRef.current.context_window : null : conversationContextWindowLimit;
           if (isDefaultConversation) {
             setHasConversationModelOverride(false);
@@ -527321,12 +527505,12 @@ function useReasoningCycle(ctx) {
             }
           } else {
             setHasConversationModelOverride(true);
-            setConversationOverrideModelSettings(conversationModelSettings2 ?? null);
+            setConversationOverrideModelSettings(conversationModelSettings ?? null);
             setConversationOverrideContextWindowLimit(resolvedConversationContextWindowLimit);
           }
           setLlmConfig({
             ...updatedAgent?.llm_config ?? llmConfigRef.current ?? {},
-            ...mapHandleToLlmConfigPatch(desired.modelHandle, providerTypeFromModelSettings3(isDefaultConversation ? updatedAgent?.model_settings ?? null : conversationModelSettings2)),
+            ...mapHandleToLlmConfigPatch(desired.modelHandle, providerTypeFromModelSettings4(isDefaultConversation ? updatedAgent?.model_settings ?? null : conversationModelSettings)),
             reasoning_effort: resolvedReasoningEffort,
             ...typeof resolvedConversationContextWindowLimit === "number" ? { context_window: resolvedConversationContextWindowLimit } : {}
           });
@@ -527389,7 +527573,7 @@ function useReasoningCycle(ctx) {
         return;
       const current = llmConfigRef.current;
       const modelSettingsForEffort = hasConversationModelOverrideRef.current ? conversationOverrideModelSettingsRef.current : agentStateRef.current?.model_settings;
-      const providerType = providerTypeFromModelSettings3(modelSettingsForEffort);
+      const providerType = providerTypeFromModelSettings4(modelSettingsForEffort);
       const modelHandle = resolveReasoningCycleModelHandle(current, hasConversationModelOverrideRef.current ? null : agentStateRef.current?.model ?? null, currentModelHandleRef.current);
       if (!modelHandle)
         return;
@@ -536093,7 +536277,7 @@ function App2({
           if (persistedToolsetPreference === "auto") {
             if (agentModelHandle) {
               const { switchToolsetForModel: switchToolsetForModel2 } = await init_toolset().then(() => exports_toolset);
-              const providerType = providerTypeFromModelSettings3(agent2.model_settings) ?? agent2.llm_config?.model_endpoint_type ?? null;
+              const providerType = providerTypeFromModelSettings4(agent2.model_settings) ?? agent2.llm_config?.model_endpoint_type ?? null;
               const derivedToolset = await switchToolsetForModel2(agentModelHandle, agentId, providerType);
               setCurrentToolset(derivedToolset);
             } else {
@@ -536194,7 +536378,7 @@ function App2({
       setConversationOverrideContextWindowLimit(null);
       setLlmConfig(agentState.llm_config);
       setCurrentModelHandle(agentModelHandle ?? null);
-      const currentHandle = buildModelHandleFromLlmConfig3(llmConfigRef.current);
+      const currentHandle = buildModelHandleFromLlmConfig(llmConfigRef.current);
       if (agentModelHandle && agentModelHandle === currentHandle) {
         return;
       }
@@ -536217,9 +536401,9 @@ function App2({
         if (cancelled)
           return;
         const conversationModel = conversation.model;
-        const conversationModelSettings2 = conversation.model_settings;
+        const conversationModelSettings = conversation.model_settings;
         const conversationContextWindowLimit = conversation.context_window_limit;
-        const hasOverride = conversationModel !== undefined && conversationModel !== null ? true : conversationModelSettings2 !== undefined && conversationModelSettings2 !== null ? true : conversationContextWindowLimit !== undefined && conversationContextWindowLimit !== null;
+        const hasOverride = conversationModel !== undefined && conversationModel !== null ? true : conversationModelSettings !== undefined && conversationModelSettings !== null ? true : conversationContextWindowLimit !== undefined && conversationContextWindowLimit !== null;
         if (!hasOverride) {
           applyAgentModelLocally();
           return;
@@ -536230,8 +536414,8 @@ function App2({
           applyAgentModelLocally();
           return;
         }
-        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 hasConversationModelSettings = conversationModelSettings !== undefined && conversationModelSettings !== null && Object.keys(conversationModelSettings).length > 0;
+        const resolvedConversationModelSettings = hasConversationModelSettings ? conversationModelSettings : 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, {
@@ -536249,7 +536433,7 @@ function App2({
         setCurrentModelId(modelInfo?.id ?? effectiveModelHandle);
         setLlmConfig({
           ...agentState.llm_config,
-          ...mapHandleToLlmConfigPatch(effectiveModelHandle, providerTypeFromModelSettings3(resolvedConversationModelSettings)),
+          ...mapHandleToLlmConfigPatch(effectiveModelHandle, providerTypeFromModelSettings4(resolvedConversationModelSettings)),
           ...typeof reasoningEffort === "string" ? { reasoning_effort: reasoningEffort } : {},
           ...typeof resolvedConversationContextWindowLimit === "number" ? { context_window: resolvedConversationContextWindowLimit } : {}
         });
@@ -536272,11 +536456,10 @@ function App2({
     setHasConversationModelOverride
   ]);
   const maybeCarryOverActiveConversationModel = import_react122.useCallback(async (targetConversationId) => {
-    if (!hasConversationModelOverrideRef.current) {
+    if (!hasConversationModelOverrideRef.current)
       return;
-    }
     const currentLlmConfig = llmConfigRef.current;
-    const rawModelHandle = buildModelHandleFromLlmConfig3(currentLlmConfig);
+    const rawModelHandle = currentModelHandleRef.current ?? buildModelHandleFromLlmConfig(currentLlmConfig);
     if (!rawModelHandle) {
       return;
     }
@@ -552617,6 +552800,7 @@ ${after}`;
 
 // src/tools/toolset.ts
 init_model();
+init_model_handles();
 init_backend2();
 init_client2();
 init_plugin_registry();
@@ -554458,4 +554642,4 @@ Error during initialization: ${message}`);
 }
 main2();
 
-//# debugId=A09A03B6B9AA731C64756E2164756E21
+//# debugId=FBD3E3DABCE593F564756E2164756E21