fss-link 1.5.0 → 1.5.1

package/bundle/fss-link.js

@@ -22379,7 +22379,7 @@ async function createContentGeneratorConfig(config, authType) {
 async function createContentGenerator(config, gcConfig, sessionId2) {
   if (DEBUG_CONTENT)
     console.log(`\u{1F41B} DEBUG createContentGenerator: authType=${config.authType}, apiKey=${config.apiKey}, baseUrl=${config.baseUrl}`);
-  const version = "1.5.0";
+  const version = "1.5.1";
   const userAgent = `FSS-Link/${version} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent
@@ -96359,7 +96359,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "1.5.0";
+  return "1.5.1";
 }
 
 // packages/cli/src/ui/commands/aboutCommand.ts
@@ -96411,7 +96411,7 @@ import open4 from "open";
 import process11 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "6eb449b6";
+var GIT_COMMIT_INFO = "7684208c";
 
 // packages/cli/src/ui/commands/bugCommand.ts
 init_dist2();
@@ -120708,6 +120708,9 @@ import { useState as useState33, useEffect as useEffect32 } from "react";
 import { Box as Box19, Text as Text26, useInput as useInput4 } from "ink";
 
 // packages/cli/src/utils/modelFetcher.ts
+init_dist2();
+var modelCache = /* @__PURE__ */ new Map();
+var MODEL_CACHE_TTL = 5 * 60 * 1e3;
 async function fetchModelsFromCustomEndpoint(baseUrl, providerType, apiKey) {
   const normalizedBase = baseUrl.replace(/\/+$/, "");
   const url2 = `${normalizedBase}/models`;
@@ -120779,6 +120782,39 @@ async function fetchModelsFromCustomEndpoint(baseUrl, providerType, apiKey) {
     throw new Error(`Connection failed: ${String(error)}`);
   }
 }
+async function fetchModelsFromProvider(provider, endpoint, apiKey, forceRefresh = false) {
+  const cacheKey = `${provider}:${endpoint || "default"}`;
+  if (!forceRefresh) {
+    const cached = modelCache.get(cacheKey);
+    if (cached && Date.now() - cached.timestamp < MODEL_CACHE_TTL) {
+      console.error(`[DEBUG] Using cached models for ${cacheKey}`);
+      return cached.models;
+    }
+  }
+  let fetchUrl;
+  if (endpoint) {
+    fetchUrl = endpoint;
+  } else {
+    switch (provider) {
+      case AuthType.OLLAMA:
+        fetchUrl = "http://localhost:11434";
+        break;
+      case AuthType.LM_STUDIO:
+        fetchUrl = "http://localhost:1234/v1";
+        break;
+      default:
+        throw new Error(`No default endpoint for provider: ${provider}`);
+    }
+  }
+  console.error(`[DEBUG] Fetching models from ${provider} at ${fetchUrl}`);
+  const models = await fetchModelsFromCustomEndpoint(fetchUrl, provider, apiKey);
+  modelCache.set(cacheKey, {
+    models,
+    timestamp: Date.now()
+  });
+  console.error(`[DEBUG] Cached ${models.length} models for ${cacheKey}`);
+  return models;
+}
 
 // packages/cli/src/ui/components/shared/PasteAwareTextInput.tsx
 import TextInput from "ink-text-input";
@@ -121791,85 +121827,104 @@ function EnhancedModelSelectionDialog({
   onBack,
   onCancel
 }) {
-  const [models, setModels] = useState37([]);
+  const [allModels, setAllModels] = useState37([]);
   const [selectedIndex, setSelectedIndex] = useState37(0);
+  const [scrollOffset, setScrollOffset] = useState37(0);
   const [loading, setLoading] = useState37(true);
   const [error, setError] = useState37(null);
   const [switching, setSwitching] = useState37(false);
-  const loadModels = async () => {
-    try {
-      const modelManager = getModelManager();
-      const allModels = await modelManager.getAllModels();
-      const filtered = allModels.filter((model) => {
-        if (model.authType !== providerType) return false;
-        const modelEndpoint = model.endpointUrl || void 0;
-        if (endpointUrl && modelEndpoint !== endpointUrl) return false;
-        if (!endpointUrl && modelEndpoint) return false;
-        return true;
-      });
-      if (filtered.length === 0) {
-        setError(`No models found for ${endpointLabel}`);
+  const VISIBLE_MODELS = 15;
+  useEffect35(() => {
+    const loadAndFetchModels = async () => {
+      setLoading(true);
+      setError(null);
+      try {
+        const modelManager = getModelManager();
+        const allDbModels = await modelManager.getAllModels();
+        const existing = allDbModels.filter(
+          (m) => m.authType === providerType && (!endpointUrl || m.endpointUrl === endpointUrl)
+        );
+        const activeModel = allDbModels.find((m) => m.isActive);
+        const activeModelId = activeModel?.modelName;
+        console.error(`[DEBUG] Fetching models for ${providerType} from ${endpointUrl || "default"}`);
+        const fetched = await fetchModelsFromProvider(providerType, endpointUrl);
+        const existingModelNames = new Set(existing.map((m) => m.modelName));
+        const merged = fetched.map((fm) => ({
+          ...fm,
+          isNew: !existingModelNames.has(fm.id),
+          isExisting: existingModelNames.has(fm.id),
+          isActive: fm.id === activeModelId
+        }));
+        merged.sort((a, b) => {
+          if (a.isActive && !b.isActive) return -1;
+          if (!a.isActive && b.isActive) return 1;
+          if (a.isExisting && !b.isExisting) return -1;
+          if (!a.isExisting && b.isExisting) return 1;
+          return 0;
+        });
+        setAllModels(merged);
+        setLoading(false);
+      } catch (err) {
+        setError(err instanceof Error ? err.message : "Failed to fetch models");
         setLoading(false);
-        return;
-      }
-      filtered.sort((a, b) => {
-        if (a.isFavorite && !b.isFavorite) return -1;
-        if (!a.isFavorite && b.isFavorite) return 1;
-        if (a.isActive && !b.isActive) return -1;
-        if (!a.isActive && b.isActive) return 1;
-        return a.modelName.localeCompare(b.modelName);
-      });
-      const activeIndex = filtered.findIndex((m) => m.isActive);
-      if (activeIndex !== -1) {
-        setSelectedIndex(activeIndex);
       }
-      setModels(filtered);
-      setLoading(false);
-    } catch (err) {
-      setError(err instanceof Error ? err.message : "Failed to load models");
-      setLoading(false);
-    }
-  };
-  useEffect35(() => {
-    loadModels();
+    };
+    loadAndFetchModels();
   }, [providerType, endpointUrl]);
   useInput6((input, key) => {
     if (loading || switching) return;
-    if (key.escape) {
+    if (key.escape || input === "b" || input === "B") {
       onBack();
       return;
     }
-    if (input === "f" || input === "F") {
-      const selectedModel = models[selectedIndex];
-      if (selectedModel.id) {
-        const modelManager = getModelManager();
-        modelManager.toggleFavorite(selectedModel.id).then(() => {
-          loadModels();
-        }).catch((err) => {
-          console.error("Failed to toggle favorite:", err);
-        });
+    if (key.upArrow && selectedIndex > 0) {
+      const newIndex = selectedIndex - 1;
+      setSelectedIndex(newIndex);
+      if (newIndex < scrollOffset) {
+        setScrollOffset(newIndex);
       }
       return;
     }
-    if (input.includes("\n") || input.includes("\r")) {
-      if (models.length > 0) {
-        const selectedModel = models[selectedIndex];
-        setSwitching(true);
-        const modelManager = getModelManager();
-        modelManager.switchToModel(selectedModel.id).then(() => {
-          onComplete();
-        }).catch((err) => {
-          setError(err instanceof Error ? err.message : "Failed to switch model");
-          setSwitching(false);
-        });
+    if (key.downArrow && selectedIndex < allModels.length - 1) {
+      const newIndex = selectedIndex + 1;
+      setSelectedIndex(newIndex);
+      if (newIndex >= scrollOffset + VISIBLE_MODELS) {
+        setScrollOffset(newIndex - VISIBLE_MODELS + 1);
       }
       return;
     }
-    if (key.upArrow && selectedIndex > 0) {
-      setSelectedIndex(selectedIndex - 1);
-    }
-    if (key.downArrow && selectedIndex < models.length - 1) {
-      setSelectedIndex(selectedIndex + 1);
+    if (key.return && allModels.length > 0) {
+      const selectedModel = allModels[selectedIndex];
+      setSwitching(true);
+      const modelManager = getModelManager();
+      (async () => {
+        try {
+          if (selectedModel.isNew) {
+            console.error(`[DEBUG] Auto-adding new model: ${selectedModel.id}`);
+            await modelManager.configureModel(
+              providerType,
+              selectedModel.id,
+              endpointUrl,
+              void 0,
+              // No API key needed for already configured endpoints
+              selectedModel.id
+              // Use model ID as display name
+            );
+          }
+          const allDbModels = await modelManager.getAllModels();
+          const dbModel = allDbModels.find((m) => m.modelName === selectedModel.id);
+          if (dbModel?.id) {
+            await modelManager.switchToModel(dbModel.id);
+            onComplete();
+          } else {
+            throw new Error("Failed to find model after adding");
+          }
+        } catch (err) {
+          setError(err instanceof Error ? err.message : "Failed to switch model");
+          setSwitching(false);
+        }
+      })();
+      return;
     }
   });
   if (loading) {
@@ -121882,11 +121937,8 @@ function EnhancedModelSelectionDialog({
         padding: 1,
         width: "100%",
         children: [
-          /* @__PURE__ */ jsxs26(Text30, { bold: true, color: Colors.AccentBlue, children: [
-            "Model Selection - ",
-            endpointLabel
-          ] }),
-          /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsx29(Text30, { children: "Loading models..." }) })
+          /* @__PURE__ */ jsx29(Text30, { bold: true, color: Colors.AccentBlue, children: "Model Selection" }),
+          /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsx29(Text30, { children: "Loading configured models..." }) })
         ]
       }
     );
@@ -121904,7 +121956,7 @@ function EnhancedModelSelectionDialog({
           /* @__PURE__ */ jsx29(Text30, { bold: true, color: Colors.AccentBlue, children: "Switching Model" }),
           /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsxs26(Text30, { children: [
             "Activating ",
-            models[selectedIndex].modelName,
+            allModels[selectedIndex]?.id,
             "..."
           ] }) })
         ]
@@ -121923,11 +121975,14 @@ function EnhancedModelSelectionDialog({
         children: [
           /* @__PURE__ */ jsx29(Text30, { bold: true, color: Colors.AccentRed, children: "Model Selection Error" }),
           /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsx29(Text30, { children: error }) }),
-          /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsx29(Text30, { color: Colors.Gray, children: "Press Esc to go back" }) })
+          /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsx29(Text30, { color: Colors.Gray, children: "Press Esc to cancel" }) })
         ]
       }
     );
   }
+  const visibleModels = allModels.slice(scrollOffset, scrollOffset + VISIBLE_MODELS);
+  const modelsAbove = scrollOffset;
+  const modelsBelow = Math.max(0, allModels.length - (scrollOffset + VISIBLE_MODELS));
   return /* @__PURE__ */ jsxs26(
     Box23,
     {
@@ -121939,15 +121994,35 @@ function EnhancedModelSelectionDialog({
       children: [
         /* @__PURE__ */ jsxs26(Text30, { bold: true, color: Colors.AccentBlue, children: [
           "Model Selection - ",
-          endpointLabel
+          providerType
         ] }),
-        /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsx29(Text30, { children: "Choose a model:" }) }),
-        /* @__PURE__ */ jsx29(Box23, { marginTop: 1, flexDirection: "column", children: models.map((model, index) => {
-          const isSelected = index === selectedIndex;
+        endpointLabel && /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsxs26(Text30, { color: Colors.Gray, children: [
+          "Endpoint: ",
+          endpointLabel
+        ] }) }),
+        /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsxs26(Text30, { children: [
+          "Select a model (",
+          allModels.length,
+          " available):"
+        ] }) }),
+        modelsAbove > 0 && /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsxs26(Text30, { color: Colors.Gray, children: [
+          "\u2191 ",
+          modelsAbove,
+          " more above"
+        ] }) }),
+        /* @__PURE__ */ jsx29(Box23, { marginTop: 1, flexDirection: "column", children: visibleModels.map((model, visibleIndex) => {
+          const actualIndex = scrollOffset + visibleIndex;
+          const isSelected = actualIndex === selectedIndex;
           const prefix = isSelected ? ">" : " ";
-          const active = model.isActive ? "\u25CF " : "";
-          const favorite = model.isFavorite ? "\u2605 " : "";
-          const label = `${prefix} ${active}${favorite}${model.modelName}`;
+          let statusIcon = "";
+          if (model.isActive) {
+            statusIcon = "\u25CF ";
+          } else if (model.isNew) {
+            statusIcon = "\u{1F195} ";
+          } else if (model.isExisting) {
+            statusIcon = "\u2713 ";
+          }
+          const label = `${prefix} ${statusIcon}${model.id}`;
           return /* @__PURE__ */ jsx29(
             Text30,
             {
@@ -121955,15 +122030,16 @@ function EnhancedModelSelectionDialog({
               bold: isSelected,
               children: label
             },
-            model.id || index
+            model.id
           );
         }) }),
-        /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsx29(Text30, { color: Colors.Gray, children: "\u25CF = Active  \u2605 = Favorite" }) }),
-        /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsx29(Text30, { color: Colors.Gray, children: "Enter to switch, F to toggle favorite, Esc to go back" }) }),
-        /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsxs26(Text30, { color: Colors.Gray, children: [
-          "Endpoint: ",
-          endpointUrl || "default"
-        ] }) })
+        modelsBelow > 0 && /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsxs26(Text30, { color: Colors.Gray, children: [
+          "\u2193 ",
+          modelsBelow,
+          " more below"
+        ] }) }),
+        /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsx29(Text30, { color: Colors.Gray, children: "\u2191/\u2193 to navigate, Enter to select, Esc/b to go back" }) }),
+        /* @__PURE__ */ jsx29(Box23, { marginTop: 1, children: /* @__PURE__ */ jsx29(Text30, { color: Colors.Gray, children: "\u{1F195} = new model, \u2713 = existing, \u25CF = currently active" }) })
       ]
     }
   );
@@ -123668,14 +123744,18 @@ async function loadCliConfig(settings, extensions, sessionId2, argv, cwd3 = proc
     const { SearchEngineConfigProvider: SearchEngineConfigProvider2 } = await Promise.resolve().then(() => (init_SearchEngineConfigProvider(), SearchEngineConfigProvider_exports));
     const configProvider = SearchEngineConfigProvider2.getInstance();
     const config2 = await configProvider.loadConfiguration();
-    console.log("[API KEY DEBUG] Search engine config loaded at startup:", {
-      hasBrave: !!config2.braveApiKey,
-      hasTavily: !!config2.tavilyApiKey,
-      braveEnvSet: !!process16.env["BRAVE_SEARCH_API_KEY"],
-      tavilyEnvSet: !!process16.env["TAVILY_API_KEY"]
-    });
+    if (debugMode) {
+      console.log("[API KEY DEBUG] Search engine config loaded at startup:", {
+        hasBrave: !!config2.braveApiKey,
+        hasTavily: !!config2.tavilyApiKey,
+        braveEnvSet: !!process16.env["BRAVE_SEARCH_API_KEY"],
+        tavilyEnvSet: !!process16.env["TAVILY_API_KEY"]
+      });
+    }
   } catch (error) {
-    console.error("[API KEY DEBUG] Failed to load search engine config at startup:", error);
+    if (debugMode) {
+      console.error("[API KEY DEBUG] Failed to load search engine config at startup:", error);
+    }
   }
   const webScraperConfigLoader = () => {
     try {
@@ -131762,6 +131842,11 @@ main().catch((error) => {
  * Copyright 2025 FSS Coding
  * SPDX-License-Identifier: Apache-2.0
  */
+/** 
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
 /*! Bundled license information:
 
 js-yaml/dist/js-yaml.mjs:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fss-link",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "engines": {
     "node": ">=20.0.0"
   },