fss-link 1.1.4 → 1.1.6

package/bundle/fss-link.js

@@ -8710,7 +8710,9 @@ var init_metrics = __esm({
       ValueType = otelApi.ValueType;
       openTelemetryAvailable = true;
     } catch (error) {
-      console.debug("OpenTelemetry unavailable, using fallback metrics system");
+      if (process.env["FSS_DEBUG"] === "true") {
+        console.debug("OpenTelemetry unavailable, using fallback metrics system");
+      }
       openTelemetryAvailable = false;
       metrics = { getMeter: () => null };
       ValueType = { INT: "int" };
@@ -11081,7 +11083,9 @@ var init_sdk = __esm({
       HttpInstrumentation = otelInstrumentationHttp.HttpInstrumentation;
       openTelemetryAvailable2 = true;
     } catch (error) {
-      console.debug("OpenTelemetry SDK unavailable, telemetry disabled");
+      if (process.env["FSS_DEBUG"] === "true") {
+        console.debug("OpenTelemetry SDK unavailable, telemetry disabled");
+      }
       openTelemetryAvailable2 = false;
     }
     if (openTelemetryAvailable2 && diag && DiagConsoleLogger && DiagLogLevel) {
@@ -11601,7 +11605,9 @@ var init_loggers = __esm({
       SemanticAttributes = otelSemanticConventions.SemanticAttributes;
       openTelemetryAvailable3 = true;
     } catch (error) {
-      console.debug("OpenTelemetry loggers unavailable, using stubs");
+      if (process.env["FSS_DEBUG"] === "true") {
+        console.debug("OpenTelemetry loggers unavailable, using stubs");
+      }
       openTelemetryAvailable3 = false;
       LogAttributes = {};
       LogRecord = class {
@@ -22084,7 +22090,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.1.4";
+  const version = "1.1.6";
   const userAgent = `FSS-Link/${version} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent
@@ -81781,6 +81787,29 @@ var init_databaseMigrations = __esm({
             db.exec("DROP TABLE IF EXISTS model_configs");
           }
         });
+        this.migrations.push({
+          version: 2,
+          name: "normalize_endpoint_urls",
+          up: (db) => {
+            db.exec(`
+          UPDATE model_configs
+          SET endpoint_url = NULL
+          WHERE endpoint_url = '' OR TRIM(endpoint_url) = ''
+        `);
+            if (process.env["FSS_DEBUG"] === "true") {
+              const result = db.exec(`
+            SELECT COUNT(*) as count
+            FROM model_configs
+            WHERE endpoint_url IS NULL
+          `);
+              const count = result[0]?.values?.[0]?.[0] || 0;
+              console.log(`Migration v2: Normalized endpoints (${count} records with NULL endpoint)`);
+            }
+          },
+          down: (db) => {
+            console.warn("Migration v2 rollback not implemented - endpoint normalization is one-way");
+          }
+        });
       }
       /**
        * Get current schema version from database
@@ -83111,57 +83140,167 @@ var init_model_database = __esm({
           [id]
         );
       }
+      /**
+       * Normalize endpoint URL to canonical form:
+       * - undefined → NULL
+       * - '' (empty string) → NULL
+       * - whitespace-only → NULL
+       * - Non-empty string → trimmed string
+       *
+       * This ensures UNIQUE(auth_type, model_name, endpoint_url) works correctly
+       */
+      normalizeEndpointUrl(endpointUrl) {
+        if (!endpointUrl || endpointUrl.trim() === "") {
+          return null;
+        }
+        return endpointUrl.trim();
+      }
+      /**
+       * Find model by UNIQUE constraint (auth_type, model_name, endpoint_url)
+       * With canonical NULL normalization, we use simple exact match
+       */
+      async findByUniqueKey(authType, modelName, endpointUrl) {
+        if (endpointUrl === null) {
+          return await safeQueryFirstWithLocking(
+            this.db,
+            `SELECT id FROM model_configs
+         WHERE auth_type = ?
+           AND model_name = ?
+           AND endpoint_url IS NULL
+         LIMIT 1`,
+            [authType, modelName]
+          );
+        } else {
+          return await safeQueryFirstWithLocking(
+            this.db,
+            `SELECT id FROM model_configs
+         WHERE auth_type = ?
+           AND model_name = ?
+           AND endpoint_url = ?
+         LIMIT 1`,
+            [authType, modelName, endpointUrl]
+          );
+        }
+      }
+      /**
+       * Update existing model record with canonical normalization
+       */
+      async updateModelRecord(recordId, config, normalizedModelName, normalizedEndpointUrl, encryptedApiKey) {
+        const updateParams = [
+          config.authType || "",
+          normalizedModelName,
+          normalizedEndpointUrl,
+          // NULL or actual URL (never '')
+          encryptedApiKey,
+          config.displayName || null,
+          config.isFavorite === true ? 1 : 0,
+          config.isActive === true ? 1 : 0,
+          recordId
+        ];
+        await safeExecWithLocking(this.db, `
+      UPDATE model_configs SET
+        auth_type = ?,
+        model_name = ?,
+        endpoint_url = ?,  -- Can be NULL
+        api_key = ?,
+        display_name = ?,
+        is_favorite = ?,
+        is_active = ?,
+        last_used = CURRENT_TIMESTAMP
+      WHERE id = ?
+    `, updateParams);
+        return recordId;
+      }
+      /**
+       * Insert new model record with canonical normalization
+       */
+      async insertModelRecord(config, normalizedModelName, normalizedEndpointUrl, encryptedApiKey) {
+        const insertParams = [
+          config.authType || "",
+          normalizedModelName,
+          normalizedEndpointUrl,
+          // NULL or actual URL (never '')
+          encryptedApiKey,
+          config.displayName || null,
+          config.isFavorite === true ? 1 : 0,
+          config.isActive === true ? 1 : 0,
+          config.source || "db"
+        ];
+        await safeExecWithLocking(this.db, `
+      INSERT INTO model_configs
+      (auth_type, model_name, endpoint_url, api_key, display_name, is_favorite, is_active, last_used, source)
+      VALUES (?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP, ?)
+    `, insertParams);
+        return getLastInsertId(this.db);
+      }
       /**
        * Upsert model configuration - UPDATE existing or INSERT new
+       *
+       * Uses cascading lookup strategy:
+       * 1. Level 1: Lookup by ID (explicit update)
+       * 2. Level 2: Lookup by UNIQUE key (auth_type, model_name, endpoint_url)
+       * 3. Level 3: Fallback to auth_type only (backward compatibility)
        */
       async upsertModelConfig(config) {
         if (!this.db) {
           throw new Error("Database not initialized");
         }
         const encryptedApiKey = config.apiKey ? FSSLinkDatabase.encryptApiKey(config.apiKey) : null;
-        const normalizedEndpointUrl = config.endpointUrl || "";
-        const existingRecord = await safeQueryFirstWithLocking(
-          this.db,
-          "SELECT id FROM model_configs WHERE auth_type = ?",
-          [config.authType]
+        const normalizedEndpointUrl = this.normalizeEndpointUrl(config.endpointUrl);
+        const normalizedModelName = config.modelName?.trim() || "";
+        let existingRecord = null;
+        if (config.id) {
+          existingRecord = await safeQueryFirstWithLocking(
+            this.db,
+            "SELECT id FROM model_configs WHERE id = ?",
+            [config.id]
+          );
+          if (existingRecord) {
+            return await this.updateModelRecord(
+              existingRecord.id,
+              config,
+              normalizedModelName,
+              normalizedEndpointUrl,
+              encryptedApiKey
+            );
+          }
+        }
+        existingRecord = await this.findByUniqueKey(
+          config.authType,
+          normalizedModelName,
+          normalizedEndpointUrl
         );
-        if (existingRecord || config.id) {
-          const recordId = existingRecord?.id || config.id;
-          const updateParams = [
-            config.authType || "",
-            config.modelName || "",
-            normalizedEndpointUrl,
-            encryptedApiKey || null,
-            config.displayName || null,
-            config.isFavorite === true ? 1 : 0,
-            config.isActive === true ? 1 : 0,
-            recordId
-          ];
-          await safeExecWithLocking(this.db, `
-        UPDATE model_configs SET 
-          auth_type = ?, model_name = ?, endpoint_url = ?, api_key = ?, 
-          display_name = ?, is_favorite = ?, is_active = ?, last_used = CURRENT_TIMESTAMP
-        WHERE id = ?
-      `, updateParams);
-          return recordId || 0;
-        } else {
-          const insertParams = [
-            config.authType || "",
-            config.modelName || "",
+        if (existingRecord) {
+          return await this.updateModelRecord(
+            existingRecord.id,
+            config,
+            normalizedModelName,
             normalizedEndpointUrl,
-            encryptedApiKey || null,
-            config.displayName || null,
-            config.isFavorite === true ? 1 : 0,
-            config.isActive === true ? 1 : 0,
-            config.source || "db"
-          ];
-          await safeExecWithLocking(this.db, `
-        INSERT INTO model_configs 
-        (auth_type, model_name, endpoint_url, api_key, display_name, is_favorite, is_active, last_used, source)
-        VALUES (?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP, ?)
-      `, insertParams);
-          return getLastInsertId(this.db);
+            encryptedApiKey
+          );
         }
+        if (!normalizedModelName || normalizedModelName === "") {
+          existingRecord = await safeQueryFirstWithLocking(
+            this.db,
+            "SELECT id FROM model_configs WHERE auth_type = ? LIMIT 1",
+            [config.authType]
+          );
+          if (existingRecord) {
+            return await this.updateModelRecord(
+              existingRecord.id,
+              config,
+              normalizedModelName,
+              normalizedEndpointUrl,
+              encryptedApiKey
+            );
+          }
+        }
+        return await this.insertModelRecord(
+          config,
+          normalizedModelName,
+          normalizedEndpointUrl,
+          encryptedApiKey
+        );
       }
       /**
        * Get all model configurations
@@ -84883,11 +85022,11 @@ var init_modelManager = __esm({
             const db2 = await this.getDb();
             const existingSettings = await db2.getProviderSettings(modelId);
             if (!existingSettings["num_ctx"]) {
-              console.log(`Creating provider settings for model ${modelId}`);
-              console.log(`\u2705 Created default provider settings for Ollama model ${modelId}: num_ctx=32768`);
+              if (DEBUG_MODEL) console.log(`Creating provider settings for model ${modelId}`);
+              if (DEBUG_MODEL) console.log(`\u2705 Created default provider settings for Ollama model ${modelId}: num_ctx=32768`);
             }
           } catch (error) {
-            console.warn("Failed to initialize provider settings for new model:", error);
+            if (DEBUG_MODEL) console.warn("Failed to initialize provider settings for new model:", error);
           }
         }
         await this.updateEnvironmentFromModel(config);
@@ -84918,7 +85057,7 @@ var init_modelManager = __esm({
         await this.updateEnvironmentFromModel(config);
         if (this.configRef && this.configRef.setModel) {
           this.configRef.setModel(modelName);
-          console.log(`\u{1F527} Notified Config of model change: ${modelName}`);
+          if (DEBUG_MODEL) console.log(`\u{1F527} Notified Config of model change: ${modelName}`);
         }
         return modelId;
       }
@@ -84942,7 +85081,7 @@ var init_modelManager = __esm({
           if (DEBUG_MODEL) console.log(`\u274C [MODEL-MANAGER] Failed to switch to model ID: ${modelId} - model not found`);
           return false;
         } catch (error) {
-          console.error(`\u274C [MODEL-MANAGER] Failed to switch to model ID ${modelId}:`, error);
+          if (DEBUG_MODEL) console.error(`\u274C [MODEL-MANAGER] Failed to switch to model ID ${modelId}:`, error);
           return false;
         }
       }
@@ -84971,7 +85110,7 @@ var init_modelManager = __esm({
           });
           const modelToActivate = models[0];
           if (!modelToActivate.id) {
-            console.error(`\u274C [MODEL-MANAGER] Model missing ID, cannot activate`);
+            if (DEBUG_MODEL) console.error(`\u274C [MODEL-MANAGER] Model missing ID, cannot activate`);
             return false;
           }
           if (DEBUG_MODEL) {
@@ -84984,7 +85123,7 @@ var init_modelManager = __esm({
           }
           return true;
         } catch (error) {
-          console.error(`\u274C [MODEL-MANAGER] Failed to switch to auth type ${authType}:`, error);
+          if (DEBUG_MODEL) console.error(`\u274C [MODEL-MANAGER] Failed to switch to auth type ${authType}:`, error);
           return false;
         }
       }
@@ -85015,7 +85154,7 @@ var init_modelManager = __esm({
         const db = await this.getDb();
         const models = await db.getAllModelConfigs();
         const modelConfigs = models.map((model) => model);
-        console.log(`\u2705 [MODEL-MANAGER] Retrieved ${modelConfigs.length} models`);
+        if (DEBUG_MODEL) console.log(`\u2705 [MODEL-MANAGER] Retrieved ${modelConfigs.length} models`);
         return modelConfigs;
       }
       /**
@@ -85028,7 +85167,7 @@ var init_modelManager = __esm({
         const db = await this.getDb();
         const favoriteModels = await db.getFavoriteModels();
         const modelConfigs = favoriteModels.map((model) => model);
-        console.log(`\u2705 [MODEL-MANAGER] Retrieved ${modelConfigs.length} favorite models`);
+        if (DEBUG_MODEL) console.log(`\u2705 [MODEL-MANAGER] Retrieved ${modelConfigs.length} favorite models`);
         return modelConfigs;
       }
       /**
@@ -85041,7 +85180,7 @@ var init_modelManager = __esm({
         const db = await this.getDb();
         const recentModels = await db.getRecentlyUsedModels(limit2);
         const modelConfigs = recentModels.map((model) => model);
-        console.log(`\u2705 [MODEL-MANAGER] Retrieved ${modelConfigs.length} recent models`);
+        if (DEBUG_MODEL) console.log(`\u2705 [MODEL-MANAGER] Retrieved ${modelConfigs.length} recent models`);
         return modelConfigs;
       }
       /**
@@ -85058,7 +85197,7 @@ var init_modelManager = __esm({
           return;
         }
         const newFavoriteStatus = await db.toggleModelFavorite(modelId);
-        console.log(`\u2705 [MODEL-MANAGER] Model ID ${modelId} favorite status: ${newFavoriteStatus ? "enabled" : "disabled"}`);
+        if (DEBUG_MODEL) console.log(`\u2705 [MODEL-MANAGER] Model ID ${modelId} favorite status: ${newFavoriteStatus ? "enabled" : "disabled"}`);
       }
       /**
        * Delete a model configuration
@@ -85120,7 +85259,7 @@ var init_modelManager = __esm({
           if (DEBUG_MODEL) console.log(`\u26A0\uFE0F [MODEL-MANAGER] No active model or auth type found`);
           return void 0;
         }
-        console.log(`\u2705 [MODEL-MANAGER] Current auth type: ${activeModel.authType}`);
+        if (DEBUG_MODEL) console.log(`\u2705 [MODEL-MANAGER] Current auth type: ${activeModel.authType}`);
         return activeModel.authType;
       }
       /**
@@ -85136,7 +85275,7 @@ var init_modelManager = __esm({
           if (DEBUG_MODEL) console.log(`\u26A0\uFE0F [MODEL-MANAGER] No active model or auth type found for FSS auth type`);
           return void 0;
         }
-        console.log(`\u2705 [MODEL-MANAGER] Current FSS auth type: ${activeModel.authType}`);
+        if (DEBUG_MODEL) console.log(`\u2705 [MODEL-MANAGER] Current FSS auth type: ${activeModel.authType}`);
         return activeModel.authType;
       }
       /**
@@ -85153,7 +85292,7 @@ var init_modelManager = __esm({
             settings = await db.getProviderSettings(model.id);
           }
         } catch (error) {
-          console.warn("Failed to load provider settings:", error);
+          if (DEBUG_MODEL) console.warn("Failed to load provider settings:", error);
         }
         await this.applyEnvironmentVariables(model, settings);
       }
@@ -85206,7 +85345,7 @@ var init_modelManager = __esm({
           case "qwen-oauth":
             break;
           default:
-            console.warn(`Unknown auth type: ${model.authType}`);
+            if (DEBUG_MODEL) console.warn(`Unknown auth type: ${model.authType}`);
             break;
         }
         if (Object.keys(settings).length > 0) {
@@ -85232,10 +85371,10 @@ var init_modelManager = __esm({
             samplingParams["top_k"] = parseInt(settings["top_k"], 10);
           }
           if (Object.keys(samplingParams).length > 0) {
-            console.debug("Provider settings ready for application:", samplingParams);
+            if (DEBUG_MODEL) console.debug("Provider settings ready for application:", samplingParams);
           }
         } catch (error) {
-          console.warn("Failed to apply provider settings:", error);
+          if (DEBUG_MODEL) console.warn("Failed to apply provider settings:", error);
         }
       }
       /**
@@ -85256,7 +85395,7 @@ var init_modelManager = __esm({
             settings = await db.getProviderSettings(activeModel.id);
             if (DEBUG_MODEL) console.log(`\u{1F41B} DEBUG getCurrentSamplingParams: Retrieved settings for model ID ${activeModel.id}:`, settings);
           } catch (dbError) {
-            console.warn(`\u26A0\uFE0F Database connection issue for provider settings (non-critical):`, dbError);
+            if (DEBUG_MODEL) console.warn(`\u26A0\uFE0F Database connection issue for provider settings (non-critical):`, dbError);
             return {};
           }
           const samplingParams = {};
@@ -85275,7 +85414,7 @@ var init_modelManager = __esm({
           if (DEBUG_MODEL) console.log(`\u{1F41B} DEBUG getCurrentSamplingParams: Final sampling params:`, samplingParams);
           return samplingParams;
         } catch (error) {
-          console.warn("Failed to get current sampling params:", error);
+          if (DEBUG_MODEL) console.warn("Failed to get current sampling params:", error);
           return {};
         }
       }
@@ -94141,7 +94280,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "1.1.4";
+  return "1.1.6";
 }
 
 // packages/cli/src/ui/commands/aboutCommand.ts
@@ -94193,7 +94332,7 @@ import open4 from "open";
 import process11 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "a15d9a12";
+var GIT_COMMIT_INFO = "2fbcfa4c";
 
 // packages/cli/src/ui/commands/bugCommand.ts
 init_dist2();
@@ -117981,8 +118120,9 @@ import { useState as useState33 } from "react";
 init_dist2();
 init_settings();
 init_database();
+var DEBUG_AUTH = process.env["FSS_DEBUG"] === "true" || process.env["NODE_ENV"] === "development";
 var validateAuthMethod = (authMethod) => {
-  console.log(`\u{1F510} [AUTH-SYSTEM] Legacy auth validation: ${authMethod}`);
+  if (DEBUG_AUTH) console.log(`\u{1F510} [AUTH-SYSTEM] Legacy auth validation: ${authMethod}`);
   loadEnvironment();
   return validateAuthEnvironment(authMethod);
 };

package/package.json

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