fluxflow-cli 1.10.1 → 1.10.2

package/dist/fluxflow.js

@@ -808,9 +808,21 @@ var init_paths = __esm({
 });
 
 // src/utils/secrets.js
+var secrets_exports = {};
+__export(secrets_exports, {
+  getAPIKey: () => getAPIKey,
+  getSearchSecrets: () => getSearchSecrets,
+  getSecret: () => getSecret,
+  removeAPIKey: () => removeAPIKey,
+  removeSecret: () => removeSecret,
+  saveAPIKey: () => saveAPIKey,
+  saveSearchId: () => saveSearchId,
+  saveSearchKey: () => saveSearchKey,
+  saveSecret: () => saveSecret
+});
 import fs3 from "fs-extra";
 import path3 from "path";
-var SECRET_FILE, getAPIKey, saveSecret, saveAPIKey, removeSecret, removeAPIKey;
+var SECRET_FILE, getAPIKey, getSecret, saveSecret, getSearchSecrets, saveAPIKey, saveSearchKey, saveSearchId, removeSecret, removeAPIKey;
 var init_secrets = __esm({
   "src/utils/secrets.js"() {
     init_crypto();
@@ -824,13 +836,34 @@ var init_secrets = __esm({
       }
       return null;
     };
+    getSecret = async (key) => {
+      try {
+        const secrets = readEncryptedJson(SECRET_FILE, {});
+        return secrets[key] || null;
+      } catch (e) {
+        return null;
+      }
+    };
     saveSecret = async (key, value) => {
       await fs3.ensureDir(SECRET_DIR);
       let current = readEncryptedJson(SECRET_FILE, {});
       current[key] = value;
       writeEncryptedJson(SECRET_FILE, current);
     };
+    getSearchSecrets = async () => {
+      try {
+        const secrets = readEncryptedJson(SECRET_FILE, {});
+        return {
+          key: secrets.GOOGLE_API_KEY || secrets.API_KEY,
+          cx: secrets.SEARCH_ID
+        };
+      } catch (e) {
+      }
+      return { key: null, cx: null };
+    };
     saveAPIKey = async (apiKey) => saveSecret("API_KEY", apiKey);
+    saveSearchKey = async (key) => saveSecret("GOOGLE_API_KEY", key);
+    saveSearchId = async (id) => saveSecret("SEARCH_ID", id);
     removeSecret = async (key) => {
       try {
         const secrets = readEncryptedJson(SECRET_FILE, {});
@@ -2658,10 +2691,21 @@ var init_settings = __esm({
       }
     };
     loadSettings = async () => {
+      let settingsObj = { ...DEFAULT_SETTINGS };
       try {
         if (await fs14.exists(SETTINGS_FILE)) {
           const saved = await fs14.readJson(SETTINGS_FILE);
-          const merged = {
+          if (saved.imageSettings && saved.imageSettings.apiKey) {
+            try {
+              const legacyKey = saved.imageSettings.apiKey;
+              const { saveSecret: saveSecret2 } = await Promise.resolve().then(() => (init_secrets(), secrets_exports));
+              await saveSecret2("POLLINATIONS_API_KEY", legacyKey);
+              saved.imageSettings.apiKey = "";
+              await fs14.writeJson(SETTINGS_FILE, saved, { spaces: 2 });
+            } catch (e) {
+            }
+          }
+          settingsObj = {
             ...DEFAULT_SETTINGS,
             ...saved,
             quotas: { ...DEFAULT_SETTINGS.quotas, ...saved.quotas },
@@ -2669,16 +2713,26 @@ var init_settings = __esm({
             profileData: { ...DEFAULT_SETTINGS.profileData, ...saved.profileData },
             imageSettings: { ...DEFAULT_SETTINGS.imageSettings, ...saved.imageSettings }
           };
-          if (merged.showFullThinking === false) {
-            merged.showFullThinking = true;
-            await fs14.writeJson(SETTINGS_FILE, merged, { spaces: 2 });
-          }
-          return merged;
         }
       } catch (err) {
         console.error("Failed to load settings:", err);
       }
-      return DEFAULT_SETTINGS;
+      try {
+        const { getSecret: getSecret2 } = await Promise.resolve().then(() => (init_secrets(), secrets_exports));
+        const customApiKey = await getSecret2("POLLINATIONS_API_KEY");
+        if (customApiKey) {
+          settingsObj.imageSettings.apiKey = customApiKey;
+        }
+      } catch (e) {
+      }
+      if (settingsObj.showFullThinking === false) {
+        settingsObj.showFullThinking = true;
+        try {
+          await fs14.writeJson(SETTINGS_FILE, settingsObj, { spaces: 2 });
+        } catch (e) {
+        }
+      }
+      return settingsObj;
     };
     migrateToExternal = async (newPath) => {
       const { FLUXFLOW_DIR: FLUXFLOW_DIR2 } = await Promise.resolve().then(() => (init_paths(), paths_exports));
@@ -2702,7 +2756,19 @@ var init_settings = __esm({
         if (!current.systemSettings.useExternalData && settings.systemSettings?.useExternalData && settings.systemSettings?.externalDataPath) {
           await migrateToExternal(settings.systemSettings.externalDataPath);
         }
+        if (settings.imageSettings && settings.imageSettings.apiKey !== void 0) {
+          const { saveSecret: saveSecret2, removeSecret: removeSecret2 } = await Promise.resolve().then(() => (init_secrets(), secrets_exports));
+          const keyToSave = settings.imageSettings.apiKey;
+          if (keyToSave) {
+            await saveSecret2("POLLINATIONS_API_KEY", keyToSave);
+          } else {
+            await removeSecret2("POLLINATIONS_API_KEY");
+          }
+        }
         const updated = { ...current, ...settings };
+        if (updated.imageSettings) {
+          updated.imageSettings = { ...updated.imageSettings, apiKey: "" };
+        }
         await fs14.ensureDir(path13.dirname(SETTINGS_FILE));
         await fs14.writeJson(SETTINGS_FILE, updated, { spaces: 2 });
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "fluxflow-cli",
-	"version": "1.10.1",
+	"version": "1.10.2",
 	"description": "A high-fidelity agentic terminal assistant for the Flux Era.",
 	"keywords": [
 		"ai",