clawfire 0.4.2 → 0.4.4

package/dist/dev.js

@@ -1457,38 +1457,89 @@ async function checkCli(projectDir) {
   return result;
 }
 async function fetchFirebaseSdkConfig(projectDir) {
-  const output = await execWithTimeout(
-    "firebase",
-    ["apps:sdkconfig", "web", "--json"],
-    projectDir,
-    15e3
-  );
-  const data = JSON.parse(output);
-  if (data?.result?.sdkConfig) {
-    return data.result.sdkConfig;
-  }
-  if (data?.result?.fileContents) {
-    const contents = data.result.fileContents;
-    const config = {};
-    const extract = (key) => {
-      const match = contents.match(new RegExp(`"${key}"\\s*:\\s*"([^"]+)"`));
-      return match ? match[1] : void 0;
-    };
-    config.apiKey = extract("apiKey");
-    config.authDomain = extract("authDomain");
-    config.projectId = extract("projectId");
-    config.storageBucket = extract("storageBucket");
-    config.messagingSenderId = extract("messagingSenderId");
-    config.appId = extract("appId");
-    return config;
+  try {
+    const output = await execWithTimeout(
+      "firebase",
+      ["apps:sdkconfig", "web", "--json"],
+      projectDir,
+      15e3
+    );
+    const config = parseSdkConfigOutput(output);
+    if (config) return config;
+  } catch {
+  }
+  let webApps = [];
+  try {
+    const appsOutput = await execWithTimeout(
+      "firebase",
+      ["apps:list", "--json"],
+      projectDir,
+      15e3
+    );
+    const appsData = JSON.parse(appsOutput);
+    const allApps = appsData?.result || [];
+    webApps = allApps.filter((a) => a.platform === "WEB").map((a) => ({
+      appId: String(a.appId || ""),
+      displayName: String(a.displayName || "")
+    })).filter((a) => a.appId);
+  } catch {
+    throw new Error(
+      "Failed to fetch Firebase SDK config. Make sure you are logged in and have an active project selected."
+    );
+  }
+  if (webApps.length === 0) {
+    throw new Error(
+      "No web app registered in this Firebase project. Go to Firebase Console > Project Settings > General > Your apps > Add app (Web) to create one, then click Auto-fill again."
+    );
+  }
+  const appId = webApps[0].appId;
+  try {
+    const output = await execWithTimeout(
+      "firebase",
+      ["apps:sdkconfig", "web", appId, "--json"],
+      projectDir,
+      15e3
+    );
+    const config = parseSdkConfigOutput(output);
+    if (config) return config;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : "Unknown error";
+    throw new Error(`Failed to fetch config for web app ${appId}: ${msg}`);
   }
   throw new Error("Could not parse Firebase SDK config from CLI output");
 }
+function parseSdkConfigOutput(output) {
+  try {
+    const data = JSON.parse(output);
+    if (data?.result?.sdkConfig) {
+      return data.result.sdkConfig;
+    }
+    if (data?.result?.fileContents) {
+      const contents = data.result.fileContents;
+      const config = {};
+      const extract = (key) => {
+        const match = contents.match(new RegExp(`"${key}"\\s*:\\s*"([^"]+)"`));
+        return match ? match[1] : void 0;
+      };
+      config.apiKey = extract("apiKey");
+      config.authDomain = extract("authDomain");
+      config.projectId = extract("projectId");
+      config.storageBucket = extract("storageBucket");
+      config.messagingSenderId = extract("messagingSenderId");
+      config.appId = extract("appId");
+      if (config.apiKey || config.projectId) return config;
+    }
+  } catch {
+  }
+  return null;
+}
 function execWithTimeout(command, args, cwd, timeoutMs) {
   return new Promise((resolve7, reject) => {
-    const proc = execFile(command, args, { cwd, timeout: timeoutMs }, (err, stdout) => {
+    const proc = execFile(command, args, { cwd, timeout: timeoutMs }, (err, stdout, stderr) => {
       if (err) {
-        reject(err);
+        const detail = stderr?.trim() || stdout?.trim() || "";
+        const enriched = new Error(`${err.message}${detail ? "\n" + detail : ""}`);
+        reject(enriched);
       } else {
         resolve7(stdout);
       }
@@ -1787,6 +1838,9 @@ function generateDashboardHtml(options) {
       document.getElementById('step-' + i).style.display = 'none';
     }
     document.getElementById('setup-done').style.display = 'none';
+    // Reset login UI state from previous interactions
+    document.getElementById('login-waiting').style.display = 'none';
+    document.getElementById('login-result').style.display = 'none';
 
     if (status.nextStep === 'done') {
       // All done!
@@ -1950,7 +2004,12 @@ function generateDashboardHtml(options) {
           var result = document.getElementById('login-result');
           result.textContent = 'Login successful! Logged in as ' + status.auth.user;
           result.style.cssText = 'display:block;margin-top:8px;font-size:13px;padding:8px 12px;border-radius:6px;background:#0a1a0a;border:1px solid #22c55e;color:#22c55e;';
-          setTimeout(refreshSetupStatus, 1500);
+          // Wait for token to fully settle, then refresh wizard + force-load projects
+          setTimeout(function() {
+            refreshSetupStatus();
+            // Extra delay for project list \u2014 Firebase CLI needs time after fresh login
+            setTimeout(function() { loadProjectList(''); }, 2500);
+          }, 2000);
         }
       })
       .catch(function() {});
@@ -1958,7 +2017,8 @@ function generateDashboardHtml(options) {
   }
 
   // \u2500\u2500\u2500 Step 3: Project Selection \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
-  function loadProjectList(currentProjectId) {
+  function loadProjectList(currentProjectId, retryCount) {
+    retryCount = retryCount || 0;
     var select = document.getElementById('project-select');
     select.innerHTML = '<option value="">Loading projects...</option>';
     select.disabled = true;
@@ -1968,10 +2028,21 @@ function generateDashboardHtml(options) {
     .then(function(data) {
       select.innerHTML = '';
       if (data.error) {
+        // Auto-retry up to 2 times on error (token might not be ready yet after fresh login)
+        if (retryCount < 2) {
+          select.innerHTML = '<option value="">Loading projects... (retry)</option>';
+          setTimeout(function() { loadProjectList(currentProjectId, retryCount + 1); }, 3000);
+          return;
+        }
         select.innerHTML = '<option value="">Error: ' + escHtml(data.error) + '</option>';
         return;
       }
       if (!data.projects || data.projects.length === 0) {
+        if (retryCount < 2) {
+          select.innerHTML = '<option value="">Loading projects... (retry)</option>';
+          setTimeout(function() { loadProjectList(currentProjectId, retryCount + 1); }, 3000);
+          return;
+        }
         select.innerHTML = '<option value="">No projects found</option>';
         return;
       }
@@ -1987,6 +2058,11 @@ function generateDashboardHtml(options) {
       select.disabled = false;
     })
     .catch(function(err) {
+      if (retryCount < 2) {
+        select.innerHTML = '<option value="">Loading projects... (retry)</option>';
+        setTimeout(function() { loadProjectList(currentProjectId, retryCount + 1); }, 3000);
+        return;
+      }
       select.innerHTML = '<option value="">Failed to load</option>';
     });
   }
@@ -2212,7 +2288,12 @@ function generateDashboardHtml(options) {
     if (wizStatus) wizStatus.style.display = 'none';
 
     fetch(API + '/__dev/firebase-sdk-config')
-    .then(function(r) { return r.json(); })
+    .then(function(r) {
+      if (!r.ok) {
+        return r.json().catch(function() { return { error: 'Server error (' + r.status + ')' }; });
+      }
+      return r.json();
+    })
     .then(function(data) {
       if (data.error) {
         showAutoFillResult(false, data.error);
@@ -2528,13 +2609,16 @@ var FirebaseSetup = class {
           `cd "${this.projectDir}"`,
           cmd,
           'echo ""',
-          'echo "Login complete! You can close this window."',
-          'read -p "Press Enter to close..."'
+          'echo "Login complete! Closing in 3 seconds..."',
+          "sleep 3",
+          // Spawn osascript in background to close this specific terminal window, then exit
+          `(sleep 1 && osascript -e 'tell application "Terminal" to close (every window whose name contains "clawfire-firebase-login")' 2>/dev/null) &`,
+          "exit 0"
         ].join("\n"), { mode: 493 });
         const child = spawn("open", [scriptPath], { detached: true, stdio: "ignore" });
         child.unref();
       } else if (os === "win32") {
-        const child = spawn("cmd", ["/c", "start", "cmd", "/k", cmd], {
+        const child = spawn("cmd", ["/c", "start", "cmd", "/c", `${cmd} && timeout /t 3 >nul`], {
           cwd: this.projectDir,
           detached: true,
           stdio: "ignore"
@@ -2547,8 +2631,9 @@ var FirebaseSetup = class {
           `cd "${this.projectDir}"`,
           cmd,
           'echo ""',
-          'echo "Login complete! You can close this window."',
-          'read -p "Press Enter to close..."'
+          'echo "Login complete! Closing in 3 seconds..."',
+          "sleep 3",
+          "exit 0"
         ].join("\n"), { mode: 493 });
         const terminals = [
           { cmd: "x-terminal-emulator", args: ["-e", scriptPath] },