keyringstorage: properly handle keyring fetching (#2108)

- if auto lock enabled, don't do anything and wait for lock password
- not try to overwrite and don't consider loaded when unlocking fails
- retry unlock and re fetch on demand (ai request)

dots/.config/quickshell/ii/services/Ai.qml

@@ -532,8 +532,6 @@ Singleton {
         modelId = modelId.toLowerCase()
         if (modelList.indexOf(modelId) !== -1) {
             const model = models[modelId]
-            // Fetch API keys if needed
-            if (model?.requires_key) KeyringStorage.fetchKeyringData();
             // See if policy prevents online models
             if (Config.options.policies.ai === 2 && !model.endpoint.includes("localhost")) {
                 root.addMessage(
@@ -641,6 +639,10 @@ Singleton {
 
         function makeRequest() {
             const model = models[currentModelId];
+
+            // Fetch API keys if needed
+            if (model?.requires_key && !KeyringStorage.loaded) KeyringStorage.fetchKeyringData();
+            
             requester.currentStrategy = root.currentApiStrategy;
             requester.currentStrategy.reset(); // Reset strategy state
 

dots/.config/quickshell/ii/services/KeyringStorage.qml

@@ -1,6 +1,7 @@
 pragma Singleton
 pragma ComponentBehavior: Bound
 
+import qs
 import qs.modules.common
 import qs.modules.common.functions
 import Quickshell;
@@ -89,11 +90,13 @@ Singleton {
     Process {
         id: getData
         command: [ // We need to use echo for a newline so splitparser does parse
-            "bash", "-c", `echo $(secret-tool lookup 'application' 'illogical-impulse')`,
+            "bash", "-c", `${Directories.scriptPath}/keyring/try_lookup.sh 2> /dev/null`,
         ]
-        stdout: SplitParser {
-            onRead: data => {
-                if(data.length === 0) return;
+        stdout: StdioCollector {
+            id: keyringDataOutputCollector
+            onStreamFinished: {
+                const data = keyringDataOutputCollector.text;
+                if (data.length === 0 || !data.startsWith("{")) return;
                 try {
                     root.keyringData = JSON.parse(data);
                     // console.log("[KeyringStorage] Keyring data fetched:", JSON.stringify(root.keyringData));
@@ -105,13 +108,15 @@ Singleton {
             }
         }
         onExited: (exitCode, exitStatus) => {
-            // console.log("[KeyringStorage] Keyring data fetch process exited with code:", exitCode);
-            if (exitCode !== 0) {
-                console.error("[KeyringStorage] Failed to get keyring data, reinitializing.");
+            console.log("[KeyringStorage] Keyring data fetch process exited with code:", exitCode);
+            if (exitCode === 1) {
+                console.error("[KeyringStorage] Entry not found, initializing.");
                 root.keyringData = {};
                 saveKeyringData()
             }
-            root.loaded = true;
+            if (exitCode !== 2) {
+                root.loaded = true;
+            }
         }
     }