clawfire 0.4.1 → 0.4.2

package/dist/dev.cjs

@@ -1607,34 +1607,15 @@ function generateDashboardHtml(options) {
             <button id="reauth-btn" onclick="startFirebaseLogin(true)" style="display:none;padding:8px 20px;background:#eab308;color:#000;border:none;border-radius:6px;font-size:13px;font-weight:600;cursor:pointer;">
               Re-authenticate
             </button>
-            <button id="cancel-login-btn" onclick="cancelFirebaseLogin()" style="display:none;padding:8px 20px;background:transparent;border:1px solid #2a2a2a;border-radius:6px;color:#a3a3a3;font-size:13px;cursor:pointer;margin-left:8px;">
-              Cancel
-            </button>
           </div>
-          <!-- Login progress / auth URL -->
-          <div id="login-progress" style="display:none;margin-top:12px;padding:16px;border-radius:8px;background:#0a0a1a;border:1px solid #3b82f6;">
+          <!-- Login waiting message -->
+          <div id="login-waiting" style="display:none;margin-top:12px;padding:16px;border-radius:8px;background:#0a0a1a;border:1px solid #3b82f6;">
             <div style="display:flex;align-items:center;gap:8px;margin-bottom:8px;">
-              <span id="login-spinner" style="display:inline-block;width:14px;height:14px;border:2px solid #3b82f6;border-top-color:transparent;border-radius:50%;animation:spin 1s linear infinite;"></span>
-              <span id="login-spinner-text" style="color:#e5e5e5;font-size:13px;font-weight:600;">Starting login...</span>
-            </div>
-            <div id="login-url-box" style="display:none;margin-top:12px;">
-              <div style="font-size:13px;color:#e5e5e5;margin-bottom:6px;font-weight:600;">Step 1: Open this link to authenticate</div>
-              <a id="login-url-link" href="#" target="_blank" rel="noopener" style="display:inline-block;padding:8px 16px;background:#3b82f6;color:#fff;border-radius:6px;font-size:13px;text-decoration:none;margin-bottom:8px;">Open Google Login</a>
-              <div style="font-size:11px;color:#666;margin-top:4px;word-break:break-all;font-family:monospace;" id="login-url-raw"></div>
+              <span style="display:inline-block;width:14px;height:14px;border:2px solid #3b82f6;border-top-color:transparent;border-radius:50%;animation:spin 1s linear infinite;"></span>
+              <span style="color:#e5e5e5;font-size:13px;font-weight:600;">Waiting for login...</span>
             </div>
-            <div id="auth-code-box" style="display:none;margin-top:12px;">
-              <div style="font-size:13px;color:#e5e5e5;margin-bottom:6px;font-weight:600;">Step 2: Paste the authorization code</div>
-              <div style="font-size:12px;color:#a3a3a3;margin-bottom:8px;">After signing in, Google will show an authorization code. Copy it and paste below.</div>
-              <div style="display:flex;gap:8px;">
-                <input id="auth-code-input" type="text" placeholder="Paste authorization code here"
-                  style="flex:1;padding:8px 12px;background:#0a0a0a;border:1px solid #2a2a2a;border-radius:6px;color:#e5e5e5;font-family:monospace;font-size:14px;outline:none;" />
-                <button id="auth-code-submit" onclick="submitAuthCode()" style="padding:8px 16px;background:#22c55e;color:#000;border:none;border-radius:6px;font-size:13px;font-weight:600;cursor:pointer;white-space:nowrap;">
-                  Submit Code
-                </button>
-              </div>
-              <div id="auth-code-error" style="display:none;margin-top:6px;font-size:12px;color:#ef4444;"></div>
-            </div>
-            <div id="login-output" style="display:none;margin-top:8px;max-height:80px;overflow-y:auto;padding:8px;background:#000;border-radius:4px;font-family:monospace;font-size:11px;color:#666;white-space:pre-wrap;"></div>
+            <div style="font-size:13px;color:#a3a3a3;">A terminal window has been opened. Please complete the Firebase login there.</div>
+            <div style="font-size:12px;color:#666;margin-top:6px;">This page will update automatically when login is detected.</div>
           </div>
           <div id="login-result" style="display:none;margin-top:8px;font-size:13px;padding:8px 12px;border-radius:6px;"></div>
         </div>
@@ -1881,14 +1862,14 @@ function generateDashboardHtml(options) {
       document.getElementById('step2-action').style.display = 'block';
       document.getElementById('login-btn').style.display = 'none';
       document.getElementById('reauth-btn').style.display = 'inline-block';
-      document.getElementById('cancel-login-btn').style.display = 'none';
+      document.getElementById('login-waiting').style.display = 'none';
     } else {
       document.getElementById('step2-icon').textContent = RED;
       document.getElementById('step2-detail').textContent = 'Not logged in to Firebase';
       document.getElementById('step2-action').style.display = 'block';
       document.getElementById('login-btn').style.display = 'inline-block';
       document.getElementById('reauth-btn').style.display = 'none';
-      document.getElementById('cancel-login-btn').style.display = 'none';
+      document.getElementById('login-waiting').style.display = 'none';
     }
 
     if (status.nextStep === 'login') {
@@ -1957,22 +1938,17 @@ function generateDashboardHtml(options) {
     });
   };
 
-  // \u2500\u2500\u2500 Step 2: Login \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\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+  // \u2500\u2500\u2500 Step 2: Login (opens terminal window) \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
   window.startFirebaseLogin = function(reauth) {
     var loginBtn = document.getElementById('login-btn');
     var reauthBtn = document.getElementById('reauth-btn');
-    var cancelBtn = document.getElementById('cancel-login-btn');
-    var progress = document.getElementById('login-progress');
+    var waiting = document.getElementById('login-waiting');
     var result = document.getElementById('login-result');
 
     loginBtn.style.display = 'none';
     reauthBtn.style.display = 'none';
-    cancelBtn.style.display = 'inline-block';
-    progress.style.display = 'block';
+    waiting.style.display = 'block';
     result.style.display = 'none';
-    document.getElementById('login-url-box').style.display = 'none';
-    document.getElementById('auth-code-box').style.display = 'none';
-    document.getElementById('login-spinner-text').textContent = 'Starting login...';
 
     fetch(API + '/__dev/setup/login', {
       method: 'POST',
@@ -1980,129 +1956,45 @@ function generateDashboardHtml(options) {
       body: JSON.stringify({ reauth: !!reauth })
     })
     .then(function(r) { return r.json(); })
-    .then(function() {
-      // Start polling login state
+    .then(function(data) {
+      if (!data.success) {
+        waiting.style.display = 'none';
+        result.textContent = data.message;
+        result.style.cssText = 'display:block;margin-top:8px;font-size:13px;padding:8px 12px;border-radius:6px;background:#1c0808;border:1px solid #ef4444;color:#ef4444;';
+        loginBtn.style.display = 'inline-block';
+        return;
+      }
+      // Poll setup status until login is detected
       startLoginPoll();
     })
     .catch(function(err) {
-      progress.style.display = 'none';
-      result.textContent = 'Failed to start login: ' + err.message;
+      waiting.style.display = 'none';
+      result.textContent = 'Failed: ' + err.message;
       result.style.cssText = 'display:block;margin-top:8px;font-size:13px;padding:8px 12px;border-radius:6px;background:#1c0808;border:1px solid #ef4444;color:#ef4444;';
       loginBtn.style.display = 'inline-block';
-      cancelBtn.style.display = 'none';
     });
   };
 
   function startLoginPoll() {
     if (loginPollTimer) clearInterval(loginPollTimer);
     loginPollTimer = setInterval(function() {
-      fetch(API + '/__dev/setup/login-state')
+      fetch(API + '/__dev/setup/status')
       .then(function(r) { return r.json(); })
-      .then(function(state) {
-        // Show auth URL if available
-        if (state.authUrl) {
-          var urlBox = document.getElementById('login-url-box');
-          var urlLink = document.getElementById('login-url-link');
-          var urlRaw = document.getElementById('login-url-raw');
-          urlBox.style.display = 'block';
-          urlLink.href = state.authUrl;
-          urlLink.textContent = 'Open Google Login';
-          if (urlRaw) urlRaw.textContent = state.authUrl;
-          document.getElementById('login-spinner-text').textContent = 'Waiting for authentication...';
-        }
-
-        // Show auth code input when waiting for code
-        if (state.waitingForCode) {
-          document.getElementById('auth-code-box').style.display = 'block';
-        }
-
-        // Show output log
-        if (state.output) {
-          var outputEl = document.getElementById('login-output');
-          outputEl.style.display = 'block';
-          outputEl.textContent = state.output.slice(-500);
-        }
-
-        // Check if done
-        if (state.completed) {
+      .then(function(status) {
+        if (status.auth.authenticated) {
           clearInterval(loginPollTimer);
           loginPollTimer = null;
-          document.getElementById('login-progress').style.display = 'none';
-          document.getElementById('cancel-login-btn').style.display = 'none';
+          document.getElementById('login-waiting').style.display = 'none';
           var result = document.getElementById('login-result');
-          result.textContent = 'Login successful!';
+          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;';
-          // Refresh wizard after short delay
           setTimeout(refreshSetupStatus, 1500);
         }
-
-        if (state.error) {
-          clearInterval(loginPollTimer);
-          loginPollTimer = null;
-          document.getElementById('login-progress').style.display = 'none';
-          document.getElementById('cancel-login-btn').style.display = 'none';
-          var result2 = document.getElementById('login-result');
-          result2.textContent = state.error;
-          result2.style.cssText = 'display:block;margin-top:8px;font-size:13px;padding:8px 12px;border-radius:6px;background:#1c0808;border:1px solid #ef4444;color:#ef4444;';
-          document.getElementById('login-btn').style.display = 'inline-block';
-        }
-
-        if (!state.active && !state.completed && !state.error) {
-          clearInterval(loginPollTimer);
-          loginPollTimer = null;
-        }
       })
       .catch(function() {});
-    }, 1500);
+    }, 3000);
   }
 
-  window.submitAuthCode = function() {
-    var input = document.getElementById('auth-code-input');
-    var errEl = document.getElementById('auth-code-error');
-    var btn = document.getElementById('auth-code-submit');
-    var code = input ? input.value.trim() : '';
-    if (!code) {
-      errEl.textContent = 'Please paste the authorization code.';
-      errEl.style.display = 'block';
-      return;
-    }
-    errEl.style.display = 'none';
-    btn.disabled = true;
-    btn.textContent = 'Submitting...';
-
-    fetch(API + '/__dev/setup/submit-auth-code', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ code: code })
-    })
-    .then(function(r) { return r.json(); })
-    .then(function(data) {
-      if (data.success) {
-        document.getElementById('login-spinner-text').textContent = 'Verifying authorization...';
-        document.getElementById('auth-code-box').style.display = 'none';
-      } else {
-        errEl.textContent = data.message || 'Failed to submit code.';
-        errEl.style.display = 'block';
-      }
-      btn.disabled = false;
-      btn.textContent = 'Submit Code';
-    })
-    .catch(function(err) {
-      errEl.textContent = 'Error: ' + err.message;
-      errEl.style.display = 'block';
-      btn.disabled = false;
-      btn.textContent = 'Submit Code';
-    });
-  };
-
-  window.cancelFirebaseLogin = function() {
-    if (loginPollTimer) { clearInterval(loginPollTimer); loginPollTimer = null; }
-    fetch(API + '/__dev/setup/cancel-login', { method: 'POST' }).catch(function() {});
-    document.getElementById('login-progress').style.display = 'none';
-    document.getElementById('cancel-login-btn').style.display = 'none';
-    document.getElementById('login-btn').style.display = 'inline-block';
-  };
-
   // \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) {
     var select = document.getElementById('project-select');
@@ -2572,16 +2464,6 @@ var import_node_path4 = require("path");
 var import_node_os = require("os");
 var FirebaseSetup = class {
   projectDir;
-  loginProcess = null;
-  loginSession = {
-    active: false,
-    authUrl: null,
-    waitingForCode: false,
-    completed: false,
-    error: null,
-    output: ""
-  };
-  loginTimeout = null;
   constructor(projectDir) {
     this.projectDir = projectDir;
   }
@@ -2661,149 +2543,89 @@ var FirebaseSetup = class {
       return { success: false, message: `Failed to install Firebase CLI: ${msg}` };
     }
   }
-  // ─── Analytics Pre-config ──────────────────────────────────────────
-  /**
-   * Pre-configure Firebase analytics preference to avoid the interactive
-   * "Allow Firebase to collect..." prompt that breaks non-TTY spawns.
-   */
-  ensureAnalyticsConfigured() {
-    try {
-      const home = (0, import_node_os.homedir)();
-      const configPath = (0, import_node_path4.join)(home, ".config", "configstore", "firebase-tools.json");
-      if ((0, import_node_fs4.existsSync)(configPath)) {
-        const config = JSON.parse((0, import_node_fs4.readFileSync)(configPath, "utf-8"));
-        if (config.usage === void 0) {
-          config.usage = false;
-          (0, import_node_fs4.writeFileSync)(configPath, JSON.stringify(config, null, 2), "utf-8");
-        }
-      } else {
-        const dir = (0, import_node_path4.dirname)(configPath);
-        (0, import_node_fs4.mkdirSync)(dir, { recursive: true });
-        (0, import_node_fs4.writeFileSync)(configPath, JSON.stringify({ usage: false }, null, 2), "utf-8");
-      }
-    } catch {
-    }
-  }
-  // ─── Login Flow ────────────────────────────────────────────────────
+  // ─── Login via Terminal ───────────────────────────────────────────
   /**
-   * Start login using `firebase login --no-localhost`.
+   * Opens a new terminal window and runs `firebase login`.
    *
-   * This mode is designed for non-TTY environments:
-   * 1. Prints a Google OAuth URL
-   * 2. User opens URL in browser and authenticates
-   * 3. Google shows an authorization code on screen
-   * 4. User pastes code back → call submitAuthCode()
+   * Firebase CLI requires a real TTY for interactive login.
+   * Instead of trying to fake a TTY, we open an actual terminal.
+   * The dashboard polls getStatus() to detect when login completes.
+   *
+   * macOS: Creates a .command file and opens it (Terminal.app)
+   * Linux: Tries common terminal emulators
+   * Windows: Opens a new cmd window
    */
-  startLogin(reauth = false) {
-    this.cleanupLogin();
-    this.ensureAnalyticsConfigured();
-    this.loginSession = {
-      active: true,
-      authUrl: null,
-      waitingForCode: false,
-      completed: false,
-      error: null,
-      output: ""
-    };
+  openLoginTerminal(reauth = false) {
+    const cmd = reauth ? "firebase login --reauth" : "firebase login";
+    const os = (0, import_node_os.platform)();
     try {
-      const args = reauth ? ["login", "--reauth", "--no-localhost"] : ["login", "--no-localhost"];
-      const proc = (0, import_node_child_process2.spawn)("firebase", args, {
-        cwd: this.projectDir,
-        stdio: ["pipe", "pipe", "pipe"],
-        env: { ...process.env, TERM: "dumb" }
-      });
-      this.loginProcess = proc;
-      const appendOutput = (data) => {
-        const text = data.toString();
-        this.loginSession.output += text;
-        const urlMatch = text.match(/(https:\/\/accounts\.google\.com\S+)/);
-        if (urlMatch) {
-          this.loginSession.authUrl = urlMatch[1];
-          this.loginSession.waitingForCode = true;
-        }
-        if (text.includes("Success") || text.includes("Logged in as")) {
-          this.loginSession.completed = true;
-          this.loginSession.active = false;
-          this.loginSession.waitingForCode = false;
-        }
-        if (text.includes("Allow Firebase to collect") || text.includes("(Y/n)")) {
+      if (os === "darwin") {
+        const scriptPath = (0, import_node_path4.join)((0, import_node_os.tmpdir)(), "clawfire-firebase-login.command");
+        (0, import_node_fs4.writeFileSync)(scriptPath, [
+          "#!/bin/bash",
+          `cd "${this.projectDir}"`,
+          cmd,
+          'echo ""',
+          'echo "Login complete! You can close this window."',
+          'read -p "Press Enter to close..."'
+        ].join("\n"), { mode: 493 });
+        const child = (0, import_node_child_process2.spawn)("open", [scriptPath], { detached: true, stdio: "ignore" });
+        child.unref();
+      } else if (os === "win32") {
+        const child = (0, import_node_child_process2.spawn)("cmd", ["/c", "start", "cmd", "/k", cmd], {
+          cwd: this.projectDir,
+          detached: true,
+          stdio: "ignore"
+        });
+        child.unref();
+      } else {
+        const scriptPath = (0, import_node_path4.join)((0, import_node_os.tmpdir)(), "clawfire-firebase-login.sh");
+        (0, import_node_fs4.writeFileSync)(scriptPath, [
+          "#!/bin/bash",
+          `cd "${this.projectDir}"`,
+          cmd,
+          'echo ""',
+          'echo "Login complete! You can close this window."',
+          'read -p "Press Enter to close..."'
+        ].join("\n"), { mode: 493 });
+        const terminals = [
+          { cmd: "x-terminal-emulator", args: ["-e", scriptPath] },
+          { cmd: "gnome-terminal", args: ["--", "bash", scriptPath] },
+          { cmd: "konsole", args: ["-e", "bash", scriptPath] },
+          { cmd: "xfce4-terminal", args: ["-e", scriptPath] },
+          { cmd: "xterm", args: ["-e", scriptPath] }
+        ];
+        let opened = false;
+        for (const t of terminals) {
           try {
-            proc.stdin?.write("n\n");
+            const child = (0, import_node_child_process2.spawn)(t.cmd, t.args, { detached: true, stdio: "ignore" });
+            child.unref();
+            child.on("error", () => {
+            });
+            opened = true;
+            break;
           } catch {
+            continue;
           }
         }
-      };
-      proc.stdout?.on("data", appendOutput);
-      proc.stderr?.on("data", appendOutput);
-      proc.on("close", (code) => {
-        this.loginSession.active = false;
-        this.loginSession.waitingForCode = false;
-        if (code === 0) {
-          this.loginSession.completed = true;
-        } else if (!this.loginSession.completed) {
-          const lines = this.loginSession.output.trim().split("\n").filter((l) => l.trim());
-          const lastLines = lines.slice(-3).join(" | ");
-          this.loginSession.error = `Login failed (exit code ${code}).` + (lastLines ? ` Details: ${lastLines}` : "") + ` Try running "firebase login" in your terminal.`;
-        }
-        this.loginProcess = null;
-      });
-      proc.on("error", (err) => {
-        this.loginSession.active = false;
-        this.loginSession.error = err.message;
-        this.loginProcess = null;
-      });
-      this.loginTimeout = setTimeout(() => {
-        if (this.loginSession.active) {
-          this.loginSession.error = "Login timed out (5 minutes). Please try again.";
-          this.cleanupLogin();
+        if (!opened) {
+          return {
+            success: false,
+            message: `Could not find a terminal emulator. Please run "${cmd}" manually in your terminal.`
+          };
         }
-      }, 5 * 60 * 1e3);
-    } catch (err) {
-      this.loginSession.active = false;
-      this.loginSession.error = err instanceof Error ? err.message : "Failed to start login";
-    }
-    return this.loginSession;
-  }
-  getLoginState() {
-    return { ...this.loginSession };
-  }
-  /**
-   * Submit the authorization code that the user copied from the browser.
-   * This writes the code to the Firebase CLI process stdin.
-   */
-  submitAuthCode(code) {
-    if (!this.loginProcess || !this.loginProcess.stdin) {
-      return { success: false, message: "No active login process. Please start login again." };
-    }
-    if (!code || !code.trim()) {
-      return { success: false, message: "Authorization code is required." };
-    }
-    try {
-      this.loginProcess.stdin.write(code.trim() + "\n");
-      this.loginSession.waitingForCode = false;
-      return { success: true, message: "Authorization code submitted. Waiting for verification..." };
-    } catch (err) {
-      return { success: false, message: "Failed to submit code: " + (err instanceof Error ? err.message : "unknown error") };
-    }
-  }
-  cancelLogin() {
-    this.cleanupLogin();
-    this.loginSession.error = "Login cancelled by user.";
-  }
-  cleanupLogin() {
-    if (this.loginProcess) {
-      try {
-        this.loginProcess.kill("SIGTERM");
-      } catch {
       }
-      this.loginProcess = null;
-    }
-    if (this.loginTimeout) {
-      clearTimeout(this.loginTimeout);
-      this.loginTimeout = null;
+      return {
+        success: true,
+        message: "Terminal window opened. Please complete the login in the new terminal."
+      };
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : "Unknown error";
+      return {
+        success: false,
+        message: `Failed to open terminal: ${msg}. Please run "${cmd}" manually in your terminal.`
+      };
     }
-    this.loginSession.active = false;
-    this.loginSession.waitingForCode = false;
   }
   // ─── Project Listing ───────────────────────────────────────────────
   async listProjects() {
@@ -2897,7 +2719,6 @@ var FirebaseSetup = class {
   }
   /** Cleanup resources */
   destroy() {
-    this.cleanupLogin();
   }
 };
 
@@ -3820,36 +3641,8 @@ ${liveReloadScript}
           reauth = !!data.reauth;
         } catch {
         }
-        const session = this.firebaseSetup.startLogin(reauth);
-        sendJson(session);
-      });
-      return;
-    }
-    if (url.pathname === "/__dev/setup/login-state" && req.method === "GET") {
-      sendJson(this.firebaseSetup.getLoginState());
-      return;
-    }
-    if (url.pathname === "/__dev/setup/cancel-login" && req.method === "POST") {
-      this.firebaseSetup.cancelLogin();
-      sendJson({ ok: true });
-      return;
-    }
-    if (url.pathname === "/__dev/setup/submit-auth-code" && req.method === "POST") {
-      let body = "";
-      req.on("data", (chunk) => {
-        body += chunk;
-      });
-      req.on("end", () => {
-        try {
-          const data = JSON.parse(body);
-          if (!data.code) {
-            sendJson({ success: false, message: "code is required" }, 400);
-            return;
-          }
-          sendJson(this.firebaseSetup.submitAuthCode(data.code));
-        } catch {
-          sendJson({ success: false, message: "Invalid JSON body" }, 400);
-        }
+        const result = this.firebaseSetup.openLoginTerminal(reauth);
+        sendJson(result);
       });
       return;
     }