demian-cli 1.0.8 → 1.0.9

package/dist/tui.mjs

@@ -23573,11 +23573,18 @@ function providerModelProfiles(providerName, providerConfig) {
   return out;
 }
 function providerModelOptions(providerName, providerConfig) {
-  return providerModelProfiles(providerName, providerConfig).filter((profile) => !profile.hidden).map((profile) => profile.displayName ?? profile.name ?? profile.model);
+  return providerModelProfiles(providerName, providerConfig).filter((profile) => !profile.hidden).map((profile) => displayModelForProfile(profile));
 }
 function defaultModelForProvider(providerName, providerConfig) {
   return providerModelProfiles(providerName, providerConfig)[0]?.model ?? "";
 }
+function displayModelForProfile(profile) {
+  return profile.displayName?.trim() || profile.name?.trim() || profile.model;
+}
+function defaultDisplayModelForProvider(providerName, providerConfig) {
+  const profile = providerModelProfiles(providerName, providerConfig)[0];
+  return profile ? displayModelForProfile(profile) : defaultModelForProvider(providerName, providerConfig);
+}
 function resolveConfiguredApiKey(providerConfig) {
   if (providerConfig.apiKey) return { value: providerConfig.apiKey };
   for (const envName of [providerConfig.apiKeyEnv, ...providerConfig.apiKeyEnvAliases ?? []]) {
@@ -23614,7 +23621,7 @@ function mergeModelProfile(providerConfig, profile) {
     ...providerConfig,
     ...definedOnly({
       baseURL: profile.baseURL,
-      apiKey: profile.apiKey,
+      apiKey: nonEmptyString(profile.apiKey),
       apiKeyEnv: profile.apiKeyEnv,
       apiKeyEnvAliases: profile.apiKeyEnvAliases,
       auth: profile.auth,
@@ -23629,6 +23636,9 @@ function mergeModelProfile(providerConfig, profile) {
 function definedOnly(input2) {
   return Object.fromEntries(Object.entries(input2).filter(([, value]) => value !== void 0));
 }
+function nonEmptyString(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
 function fallbackModelForProvider(providerName, providerConfig) {
   if (typeof providerConfig.model === "string" && providerConfig.model.trim()) return providerConfig.model.trim();
   if (providerName === "openai") return "gpt-5.5";
@@ -23932,6 +23942,7 @@ var init_config = __esm({
         defaultProvider: "brave",
         providers: {
           brave: {
+            apiKey: "",
             apiKeyEnv: "BRAVE_SEARCH_API_KEY",
             endpoint: "https://api.search.brave.com/res/v1/web/search",
             count: 10,
@@ -23940,12 +23951,14 @@ var init_config = __esm({
             safeSearch: "moderate"
           },
           tavily: {
+            apiKey: "",
             apiKeyEnv: "TAVILY_API_KEY",
             endpoint: "https://api.tavily.com/search",
             maxResults: 5,
             searchDepth: "basic"
           },
           exa: {
+            apiKey: "",
             apiKeyEnv: "EXA_API_KEY",
             endpoint: "https://api.exa.ai/search",
             numResults: 5,
@@ -24000,6 +24013,7 @@ var init_config = __esm({
         openai: {
           type: "openai-compatible",
           baseURL: "https://api.openai.com/v1",
+          apiKey: "",
           apiKeyEnv: "OPENAI_API_KEY",
           catalog: {
             type: "openai-models",
@@ -24009,6 +24023,7 @@ var init_config = __esm({
         anthropic: {
           type: "anthropic",
           baseURL: "https://api.anthropic.com/v1",
+          apiKey: "",
           apiKeyEnv: "ANTHROPIC_API_KEY",
           catalog: {
             type: "anthropic-models",
@@ -24018,6 +24033,7 @@ var init_config = __esm({
         gemini: {
           type: "openai-compatible",
           baseURL: "https://generativelanguage.googleapis.com/v1beta/openai/",
+          apiKey: "",
           apiKeyEnv: "GEMINI_API_KEY",
           apiKeyEnvAliases: ["GOOGLE_API_KEY"],
           catalog: {
@@ -24028,6 +24044,7 @@ var init_config = __esm({
         groq: {
           type: "openai-compatible",
           baseURL: "https://api.groq.com/openai/v1",
+          apiKey: "",
           apiKeyEnv: "GROQ_API_KEY",
           catalog: {
             type: "groq-models",
@@ -24043,6 +24060,7 @@ var init_config = __esm({
               displayName: "Azure example",
               model: "azure-deployment-name",
               baseURL: "https://example.openai.azure.com/openai/v1",
+              apiKey: "",
               apiKeyEnv: "AZURE_OPENAI_API_KEY"
             }
           ]
@@ -24051,6 +24069,7 @@ var init_config = __esm({
           type: "openai-compatible",
           baseURL: "http://localhost:1234/v1",
           apiKey: "lm-studio",
+          modelProfiles: [],
           catalog: {
             type: "openai-compatible-models",
             endpoint: "http://localhost:1234/v1/models"
@@ -24060,6 +24079,7 @@ var init_config = __esm({
           type: "openai-compatible",
           baseURL: "http://localhost:11434/v1",
           apiKey: "ollama",
+          modelProfiles: [],
           quirks: { omitTemperature: true },
           catalog: {
             type: "openai-compatible-models",
@@ -24069,7 +24089,9 @@ var init_config = __esm({
         "ollama-cloud": {
           type: "ollama",
           baseURL: "https://ollama.com/api",
+          apiKey: "",
           apiKeyEnv: "OLLAMA_API_KEY",
+          modelProfiles: [],
           catalog: {
             type: "ollama-tags",
             endpoint: "https://ollama.com/api/tags"
@@ -24079,6 +24101,7 @@ var init_config = __esm({
           type: "openai-compatible",
           baseURL: "http://localhost:8080/v1",
           apiKey: "llama.cpp",
+          modelProfiles: [],
           catalog: {
             type: "openai-compatible-models",
             endpoint: "http://localhost:8080/v1/models"
@@ -24088,6 +24111,7 @@ var init_config = __esm({
           type: "openai-compatible",
           baseURL: "http://localhost:8000/v1",
           apiKey: "vllm",
+          modelProfiles: [],
           catalog: {
             type: "openai-compatible-models",
             endpoint: "http://localhost:8000/v1/models"
@@ -30877,7 +30901,7 @@ async function runExaSearch(config, options) {
   return searchResult("exa", options.query, results, json.value);
 }
 function resolveApiKey(provider, config) {
-  const value = config.apiKey ?? (config.apiKeyEnv ? process.env[config.apiKeyEnv] : void 0);
+  const value = config.apiKey || (config.apiKeyEnv ? process.env[config.apiKeyEnv] : void 0);
   if (value) return { ok: true, value };
   return toolFail(`Missing API key for web_search provider "${provider}". Set webSearch.providers.${provider}.apiKey or set ${config.apiKeyEnv ?? "the configured apiKeyEnv"}.`);
 }
@@ -33864,7 +33888,7 @@ function providerOptions(config, catalogs = {}) {
       isDefault: model.isDefault
     })) : providerModelProfiles(name, provider);
     const modelProfiles = profiles.map((profile) => {
-      const displayName = profile.displayName ?? profile.name ?? profile.model;
+      const displayName = displayModelForProfile(profile);
       return {
         ...profile,
         label: available ? displayName : unavailableLabel(displayName),
@@ -33872,7 +33896,7 @@ function providerOptions(config, catalogs = {}) {
       };
     });
     const models = modelProfiles.length ? [...new Set(modelProfiles.map((item) => item.model).filter((item) => typeof item === "string" && item.trim()))] : providerModelOptions(name, provider);
-    const defaultModel = defaultModelForProvider(name, provider);
+    const defaultModel = defaultDisplayModelForProvider(name, provider);
     return {
       name,
       label: available ? name : unavailableLabel(name),
@@ -33935,13 +33959,18 @@ function createInteractiveModelSelection(config, flags = {}, saved) {
   }
   const usesSavedProvider = !flags.provider && savedProviderExists && providerName === savedProviderName;
   const savedModel = usesSavedProvider && saved?.model ? saved.model : void 0;
-  const model = flags.model ?? savedModel ?? defaultModelForProvider(providerName, providerConfig);
+  const profiles = providerModelProfiles(providerName, providerConfig);
+  const savedProfile = savedModel ? profiles.find((profile) => profile.model === savedModel || profile.displayName === savedModel || profile.name === savedModel) : void 0;
+  const defaultModel = displayModelForProfile(profiles[0] ?? { name: "", displayName: "", model: "" }) || defaultDisplayModelForProvider(providerName, providerConfig);
+  const flagProfile = flags.model ? profiles.find((profile) => profile.model === flags.model || profile.displayName === flags.model || profile.name === flags.model) : void 0;
+  const selectedProfile = flags.model ? flagProfile : savedModel ? savedProfile : profiles[0];
+  const model = flags.model ?? (savedProfile ? displayModelForProfile(savedProfile) : savedModel) ?? defaultModel;
   return {
     providerName,
     providerSource: flags.provider ? "flag" : usesSavedProvider ? "saved" : "config",
     model,
     modelSource: flags.model ? "flag" : savedModel ? "saved" : "config",
-    modelProfileName: providerModelProfiles(providerName, providerConfig).find((profile) => profile.model === model || profile.displayName === model || profile.name === model)?.name
+    modelProfileName: selectedProfile?.name
   };
 }
 function providerCatalogAvailable(catalog) {
@@ -34492,18 +34521,21 @@ function defaultUserConfig(defaultProvider = detectDefaultProvider()) {
       openai: {
         type: "openai-compatible",
         baseURL: "https://api.openai.com/v1",
+        apiKey: "",
         apiKeyEnv: "OPENAI_API_KEY",
         catalog: { type: "openai-models", endpoint: "https://api.openai.com/v1/models" }
       },
       anthropic: {
         type: "anthropic",
         baseURL: "https://api.anthropic.com/v1",
+        apiKey: "",
         apiKeyEnv: "ANTHROPIC_API_KEY",
         catalog: { type: "anthropic-models", endpoint: "https://api.anthropic.com/v1/models" }
       },
       gemini: {
         type: "openai-compatible",
         baseURL: "https://generativelanguage.googleapis.com/v1beta/openai/",
+        apiKey: "",
         apiKeyEnv: "GEMINI_API_KEY",
         apiKeyEnvAliases: ["GOOGLE_API_KEY"],
         catalog: { type: "gemini-openai-models", endpoint: "https://generativelanguage.googleapis.com/v1beta/openai/models" }
@@ -34511,6 +34543,7 @@ function defaultUserConfig(defaultProvider = detectDefaultProvider()) {
       groq: {
         type: "openai-compatible",
         baseURL: "https://api.groq.com/openai/v1",
+        apiKey: "",
         apiKeyEnv: "GROQ_API_KEY",
         catalog: { type: "groq-models", endpoint: "https://api.groq.com/openai/v1/models" }
       },
@@ -34523,6 +34556,7 @@ function defaultUserConfig(defaultProvider = detectDefaultProvider()) {
             displayName: "Azure example",
             model: "azure-deployment-name",
             baseURL: "https://example.openai.azure.com/openai/v1",
+            apiKey: "",
             apiKeyEnv: "AZURE_OPENAI_API_KEY"
           }
         ]
@@ -34531,31 +34565,37 @@ function defaultUserConfig(defaultProvider = detectDefaultProvider()) {
         type: "openai-compatible",
         baseURL: "http://localhost:1234/v1",
         apiKey: "lm-studio",
+        modelProfiles: [],
         catalog: { type: "openai-compatible-models", endpoint: "http://localhost:1234/v1/models" }
       },
       "ollama-local": {
         type: "openai-compatible",
         baseURL: "http://localhost:11434/v1",
         apiKey: "ollama",
+        modelProfiles: [],
         quirks: { omitTemperature: true },
         catalog: { type: "openai-compatible-models", endpoint: "http://localhost:11434/v1/models" }
       },
       "ollama-cloud": {
         type: "ollama",
         baseURL: "https://ollama.com/api",
+        apiKey: "",
         apiKeyEnv: "OLLAMA_API_KEY",
+        modelProfiles: [],
         catalog: { type: "ollama-tags", endpoint: "https://ollama.com/api/tags" }
       },
       llamacpp: {
         type: "openai-compatible",
         baseURL: "http://localhost:8080/v1",
         apiKey: "llama.cpp",
+        modelProfiles: [],
         catalog: { type: "openai-compatible-models", endpoint: "http://localhost:8080/v1/models" }
       },
       vllm: {
         type: "openai-compatible",
         baseURL: "http://localhost:8000/v1",
         apiKey: "vllm",
+        modelProfiles: [],
         catalog: { type: "openai-compatible-models", endpoint: "http://localhost:8000/v1/models" }
       },
       codex: {
@@ -34627,7 +34667,7 @@ async function addModelProfile(options) {
     displayName,
     model: options.model,
     ...options.baseURL ? { baseURL: options.baseURL } : {},
-    ...options.apiKey ? { apiKey: options.apiKey } : {},
+    ...options.apiKey !== void 0 || options.apiKeyEnv ? { apiKey: options.apiKey ?? "" } : {},
     ...options.apiKeyEnv ? { apiKeyEnv: options.apiKeyEnv } : {}
   };
   if (existingByName >= 0) profiles[existingByName] = next;
@@ -34649,18 +34689,15 @@ async function readConfigObject(filePath) {
 }
 function providerPreset(options) {
   const preset = options.preset ?? options.name;
-  const auth = {
-    ...options.apiKey ? { apiKey: options.apiKey } : {},
-    ...options.apiKeyEnv ? { apiKeyEnv: options.apiKeyEnv } : {}
-  };
+  const auth = apiKeyAuthFields(options);
   const openAIAuth = options.authHeader ? { auth: { type: "api-key", header: options.authHeader } } : {};
-  if (preset === "openai") return { type: "openai-compatible", baseURL: options.baseURL ?? "https://api.openai.com/v1", apiKeyEnv: "OPENAI_API_KEY", ...auth, ...openAIAuth, catalog: { type: "openai-models", endpoint: `${(options.baseURL ?? "https://api.openai.com/v1").replace(/\/+$/, "")}/models` } };
-  if (preset === "anthropic") return { type: "anthropic", baseURL: options.baseURL ?? "https://api.anthropic.com/v1", apiKeyEnv: "ANTHROPIC_API_KEY", ...auth, catalog: { type: "anthropic-models", endpoint: `${(options.baseURL ?? "https://api.anthropic.com/v1").replace(/\/+$/, "")}/models` } };
+  if (preset === "openai") return { type: "openai-compatible", baseURL: options.baseURL ?? "https://api.openai.com/v1", ...apiKeyAuthFields(options, "OPENAI_API_KEY"), ...openAIAuth, catalog: { type: "openai-models", endpoint: `${(options.baseURL ?? "https://api.openai.com/v1").replace(/\/+$/, "")}/models` } };
+  if (preset === "anthropic") return { type: "anthropic", baseURL: options.baseURL ?? "https://api.anthropic.com/v1", ...apiKeyAuthFields(options, "ANTHROPIC_API_KEY"), catalog: { type: "anthropic-models", endpoint: `${(options.baseURL ?? "https://api.anthropic.com/v1").replace(/\/+$/, "")}/models` } };
   if (preset === "gemini") {
     const geminiBase = options.baseURL ?? "https://generativelanguage.googleapis.com/v1beta/openai/";
-    return { type: "openai-compatible", baseURL: geminiBase, apiKeyEnv: "GEMINI_API_KEY", apiKeyEnvAliases: ["GOOGLE_API_KEY"], ...auth, ...openAIAuth, catalog: { type: "gemini-openai-models", endpoint: `${geminiBase.replace(/\/+$/, "")}/models` } };
+    return { type: "openai-compatible", baseURL: geminiBase, ...apiKeyAuthFields(options, "GEMINI_API_KEY"), apiKeyEnvAliases: ["GOOGLE_API_KEY"], ...openAIAuth, catalog: { type: "gemini-openai-models", endpoint: `${geminiBase.replace(/\/+$/, "")}/models` } };
   }
-  if (preset === "groq") return { type: "openai-compatible", baseURL: options.baseURL ?? "https://api.groq.com/openai/v1", apiKeyEnv: "GROQ_API_KEY", ...auth, ...openAIAuth, catalog: { type: "groq-models", endpoint: `${(options.baseURL ?? "https://api.groq.com/openai/v1").replace(/\/+$/, "")}/models` } };
+  if (preset === "groq") return { type: "openai-compatible", baseURL: options.baseURL ?? "https://api.groq.com/openai/v1", ...apiKeyAuthFields(options, "GROQ_API_KEY"), ...openAIAuth, catalog: { type: "groq-models", endpoint: `${(options.baseURL ?? "https://api.groq.com/openai/v1").replace(/\/+$/, "")}/models` } };
   if (preset === "azure") {
     return {
       type: "openai-compatible",
@@ -34672,16 +34709,17 @@ function providerPreset(options) {
           displayName: "Azure example",
           model: "azure-deployment-name",
           baseURL: options.baseURL ?? "https://example.openai.azure.com/openai/v1",
+          ...options.apiKey ? {} : { apiKey: "" },
           apiKeyEnv: options.apiKeyEnv ?? "AZURE_OPENAI_API_KEY"
         }
       ]
     };
   }
-  if (preset === "lmstudio") return { type: "openai-compatible", baseURL: options.baseURL ?? "http://localhost:1234/v1", apiKey: options.apiKey ?? "lm-studio", catalog: { type: "openai-compatible-models", endpoint: `${(options.baseURL ?? "http://localhost:1234/v1").replace(/\/+$/, "")}/models` } };
-  if (preset === "ollama-local" || preset === "ollama") return { type: "openai-compatible", baseURL: options.baseURL ?? "http://localhost:11434/v1", apiKey: options.apiKey ?? "ollama", quirks: { omitTemperature: true }, catalog: { type: "openai-compatible-models", endpoint: `${(options.baseURL ?? "http://localhost:11434/v1").replace(/\/+$/, "")}/models` } };
-  if (preset === "ollama-cloud") return { type: "ollama", baseURL: options.baseURL ?? "https://ollama.com/api", ...auth, catalog: { type: "ollama-tags", endpoint: `${(options.baseURL ?? "https://ollama.com/api").replace(/\/+$/, "")}/tags` } };
-  if (preset === "llamacpp") return { type: "openai-compatible", baseURL: options.baseURL ?? "http://localhost:8080/v1", apiKey: options.apiKey ?? "llama.cpp", catalog: { type: "openai-compatible-models", endpoint: `${(options.baseURL ?? "http://localhost:8080/v1").replace(/\/+$/, "")}/models` } };
-  if (preset === "vllm") return { type: "openai-compatible", baseURL: options.baseURL ?? "http://localhost:8000/v1", apiKey: options.apiKey ?? "vllm", catalog: { type: "openai-compatible-models", endpoint: `${(options.baseURL ?? "http://localhost:8000/v1").replace(/\/+$/, "")}/models` } };
+  if (preset === "lmstudio") return { type: "openai-compatible", baseURL: options.baseURL ?? "http://localhost:1234/v1", apiKey: options.apiKey ?? "lm-studio", modelProfiles: [], catalog: { type: "openai-compatible-models", endpoint: `${(options.baseURL ?? "http://localhost:1234/v1").replace(/\/+$/, "")}/models` } };
+  if (preset === "ollama-local" || preset === "ollama") return { type: "openai-compatible", baseURL: options.baseURL ?? "http://localhost:11434/v1", apiKey: options.apiKey ?? "ollama", modelProfiles: [], quirks: { omitTemperature: true }, catalog: { type: "openai-compatible-models", endpoint: `${(options.baseURL ?? "http://localhost:11434/v1").replace(/\/+$/, "")}/models` } };
+  if (preset === "ollama-cloud") return { type: "ollama", baseURL: options.baseURL ?? "https://ollama.com/api", ...apiKeyAuthFields(options, "OLLAMA_API_KEY"), modelProfiles: [], catalog: { type: "ollama-tags", endpoint: `${(options.baseURL ?? "https://ollama.com/api").replace(/\/+$/, "")}/tags` } };
+  if (preset === "llamacpp") return { type: "openai-compatible", baseURL: options.baseURL ?? "http://localhost:8080/v1", apiKey: options.apiKey ?? "llama.cpp", modelProfiles: [], catalog: { type: "openai-compatible-models", endpoint: `${(options.baseURL ?? "http://localhost:8080/v1").replace(/\/+$/, "")}/models` } };
+  if (preset === "vllm") return { type: "openai-compatible", baseURL: options.baseURL ?? "http://localhost:8000/v1", apiKey: options.apiKey ?? "vllm", modelProfiles: [], catalog: { type: "openai-compatible-models", endpoint: `${(options.baseURL ?? "http://localhost:8000/v1").replace(/\/+$/, "")}/models` } };
   if (preset === "codex") return { type: "codex", baseURL: options.baseURL ?? "https://chatgpt.com/backend-api/codex", authStore: "auto", allowApiKeyFallback: false, promptCacheKey: "root-session", catalog: { type: "codex-oauth-models" } };
   if (preset === "claudecode") return { type: "claudecode", runtime: "agent-sdk", cliPath: "~/.local/bin/claude", cwdMode: "session", historyPolicy: "passthrough-resume", onInvalidResume: "fresh", attachmentFallback: "block", allowSubagents: false, sanitizeApiKeyEnv: true, authPreflight: true, useBareMode: false, usageLedgerScope: "process", sessionLock: true, abortPolicy: "record-only", catalog: { type: "claudecode-supported-models" } };
   if ((options.type ?? preset) === "openai-compatible") {
@@ -34690,14 +34728,20 @@ function providerPreset(options) {
     return {
       type: "openai-compatible",
       baseURL,
-      ...options.apiKey ? { apiKey: options.apiKey } : {},
-      ...options.apiKeyEnv ? { apiKeyEnv: options.apiKeyEnv } : {},
+      ...auth,
       ...openAIAuth,
       catalog: { type: "openai-compatible-models", endpoint: `${baseURL.replace(/\/+$/, "")}/models` }
     };
   }
   throw new Error(`Unknown provider preset: ${preset}`);
 }
+function apiKeyAuthFields(options, defaultApiKeyEnv) {
+  const apiKeyEnv = options.apiKeyEnv ?? defaultApiKeyEnv;
+  return {
+    ...options.apiKey !== void 0 || apiKeyEnv ? { apiKey: options.apiKey ?? "" } : {},
+    ...apiKeyEnv ? { apiKeyEnv } : {}
+  };
+}
 async function writeJsonAtomic(filePath, content) {
   await mkdir(path3.dirname(filePath), { recursive: true, mode: 448 });
   const temp = `${filePath}.${process.pid}.${Date.now()}.tmp`;