clawfire 0.4.0 → 0.4.2

package/dist/cli.js

@@ -209,7 +209,7 @@ async function runDevServer() {
   const port = portArg ? parseInt(portArg.split("=")[1], 10) : 3e3;
   const apiPort = apiPortArg ? parseInt(apiPortArg.split("=")[1], 10) : 3456;
   const noHotReload = args.includes("--no-hot-reload");
-  const { startDevServer } = await import("./dev-server-MMWHTL5T.js");
+  const { startDevServer } = await import("./dev-server-65H4AQFS.js");
   await startDevServer({
     projectDir,
     port,

package/dist/{dev-server-MMWHTL5T.js → dev-server-65H4AQFS.js}

@@ -1189,27 +1189,21 @@ function generateDashboardHtml(options) {
             </div>
           </div>
           <div id="step2-action" style="display:none;">
-            <button id="login-btn" onclick="startFirebaseLogin()" style="padding:8px 20px;background:#3b82f6;color:#fff;border:none;border-radius:6px;font-size:13px;font-weight:600;cursor:pointer;">
+            <button id="login-btn" onclick="startFirebaseLogin(false)" style="padding:8px 20px;background:#3b82f6;color:#fff;border:none;border-radius:6px;font-size:13px;font-weight:600;cursor:pointer;">
               Login to Firebase
             </button>
-            <button id="reauth-btn" onclick="startFirebaseLogin()" style="display:none;padding:8px 20px;background:#eab308;color:#000;border:none;border-radius:6px;font-size:13px;font-weight:600;cursor:pointer;">
+            <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 style="color:#e5e5e5;font-size:13px;font-weight:600;">Waiting for authentication...</span>
-            </div>
-            <div id="login-url-box" style="display:none;margin-top:8px;">
-              <div style="font-size:12px;color:#a3a3a3;margin-bottom:4px;">If the browser didn't open automatically, click the link below:</div>
-              <a id="login-url-link" href="#" target="_blank" rel="noopener" style="color:#3b82f6;font-size:13px;word-break:break-all;font-family:monospace;"></a>
+              <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="login-output" style="display:none;margin-top:8px;max-height:100px;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>
@@ -1260,7 +1254,7 @@ function generateDashboardHtml(options) {
         <div id="setup-done" style="display:none;padding:16px;border-radius:8px;background:#0a1a0a;border:1px solid #22c55e;text-align:center;">
           <div style="font-size:16px;color:#22c55e;font-weight:700;margin-bottom:4px;">Setup Complete</div>
           <div id="setup-done-detail" style="font-size:13px;color:#a3a3a3;"></div>
-          <button onclick="startFirebaseLogin()" style="margin-top:8px;padding:6px 14px;background:transparent;border:1px solid #2a2a2a;border-radius:6px;color:#a3a3a3;font-size:12px;cursor:pointer;">Re-authenticate</button>
+          <button onclick="startFirebaseLogin(true)" style="margin-top:8px;padding:6px 14px;background:transparent;border:1px solid #2a2a2a;border-radius:6px;color:#a3a3a3;font-size:12px;cursor:pointer;">Re-authenticate</button>
         </div>
       </div>
     </div>
@@ -1456,14 +1450,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') {
@@ -1532,99 +1526,63 @@ 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
-  window.startFirebaseLogin = function() {
+  // \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';
 
-    fetch(API + '/__dev/setup/login', { method: 'POST' })
+    fetch(API + '/__dev/setup/login', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      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');
-          urlBox.style.display = 'block';
-          urlLink.href = state.authUrl;
-          urlLink.textContent = state.authUrl.length > 80 ? state.authUrl.slice(0, 80) + '...' : state.authUrl;
-        }
-
-        // 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.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');
@@ -2090,18 +2048,10 @@ function generateDashboardHtml(options) {
 // src/dev/firebase-setup.ts
 import { execFile as execFile2, spawn } from "child_process";
 import { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
-import { resolve as resolve4 } from "path";
+import { resolve as resolve4, join as join3 } from "path";
+import { tmpdir, platform } from "os";
 var FirebaseSetup = class {
   projectDir;
-  loginProcess = null;
-  loginSession = {
-    active: false,
-    authUrl: null,
-    completed: false,
-    error: null,
-    output: ""
-  };
-  loginTimeout = null;
   constructor(projectDir) {
     this.projectDir = projectDir;
   }
@@ -2164,7 +2114,7 @@ var FirebaseSetup = class {
         return { success: true, message: "Firebase CLI is already installed." };
       } catch {
       }
-      const output = await this.execTimeout(
+      await this.execTimeout(
         "npm",
         ["install", "-g", "firebase-tools"],
         12e4
@@ -2181,93 +2131,89 @@ var FirebaseSetup = class {
       return { success: false, message: `Failed to install Firebase CLI: ${msg}` };
     }
   }
-  // ─── Login Flow ────────────────────────────────────────────────────
-  startLogin() {
-    this.cleanupLogin();
-    this.loginSession = {
-      active: true,
-      authUrl: null,
-      completed: false,
-      error: null,
-      output: ""
-    };
+  // ─── Login via Terminal ───────────────────────────────────────────
+  /**
+   * Opens a new terminal window and runs `firebase login`.
+   *
+   * 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
+   */
+  openLoginTerminal(reauth = false) {
+    const cmd = reauth ? "firebase login --reauth" : "firebase login";
+    const os = platform();
     try {
-      const proc = spawn("firebase", ["login", "--reauth"], {
-        cwd: this.projectDir,
-        stdio: ["pipe", "pipe", "pipe"],
-        env: { ...process.env }
-      });
-      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];
-        }
-        const localhostMatch = text.match(/(http:\/\/localhost:\d+\S*)/);
-        if (localhostMatch && !this.loginSession.authUrl) {
-          this.loginSession.authUrl = localhostMatch[1];
-        }
-        if (text.includes("Success") || text.includes("Logged in as") || text.includes("\u2714")) {
-          this.loginSession.completed = true;
-          this.loginSession.active = false;
-        }
-        if (text.includes("Allow Firebase to collect") || text.includes("analytics")) {
+      if (os === "darwin") {
+        const scriptPath = join3(tmpdir(), "clawfire-firebase-login.command");
+        writeFileSync2(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 = spawn("open", [scriptPath], { detached: true, stdio: "ignore" });
+        child.unref();
+      } else if (os === "win32") {
+        const child = spawn("cmd", ["/c", "start", "cmd", "/k", cmd], {
+          cwd: this.projectDir,
+          detached: true,
+          stdio: "ignore"
+        });
+        child.unref();
+      } else {
+        const scriptPath = join3(tmpdir(), "clawfire-firebase-login.sh");
+        writeFileSync2(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 = 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;
-        if (code === 0) {
-          this.loginSession.completed = true;
-        } else if (!this.loginSession.completed) {
-          this.loginSession.error = `Login process exited with code ${code}`;
-        }
-        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 };
-  }
-  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;
   }
   // ─── Project Listing ───────────────────────────────────────────────
   async listProjects() {
@@ -2275,7 +2221,8 @@ var FirebaseSetup = class {
       const output = await this.execTimeout(
         "firebase",
         ["projects:list", "--json"],
-        15e3
+        3e4
+        // 30s — can be slow on first call
       );
       const data = JSON.parse(output);
       if (data?.result && Array.isArray(data.result)) {
@@ -2290,8 +2237,11 @@ var FirebaseSetup = class {
       return { projects: [], error: "Unexpected response format" };
     } catch (err) {
       const msg = err instanceof Error ? err.message : "Unknown error";
-      if (msg.includes("authenticate") || msg.includes("login")) {
-        return { projects: [], error: "Not authenticated. Please login first." };
+      if (msg.includes("authenticate") || msg.includes("login") || msg.includes("credential")) {
+        return { projects: [], error: "Session expired. Please re-authenticate first." };
+      }
+      if (msg.includes("Timeout")) {
+        return { projects: [], error: "Request timed out. Please try again." };
       }
       return { projects: [], error: msg };
     }
@@ -2322,7 +2272,7 @@ var FirebaseSetup = class {
       rc.projects.default = projectId;
       writeFileSync2(firebasercPath, JSON.stringify(rc, null, 2) + "\n", "utf-8");
       return { success: true, message: `Active project set to "${projectId}".` };
-    } catch (err) {
+    } catch {
       try {
         const firebasercPath = resolve4(this.projectDir, ".firebaserc");
         const rc = {
@@ -2331,7 +2281,7 @@ var FirebaseSetup = class {
         writeFileSync2(firebasercPath, JSON.stringify(rc, null, 2) + "\n", "utf-8");
         return { success: true, message: `Active project set to "${projectId}" (via .firebaserc).` };
       } catch (writeErr) {
-        const msg = err instanceof Error ? err.message : "Unknown error";
+        const msg = writeErr instanceof Error ? writeErr.message : "Unknown error";
         return { success: false, message: `Failed to set project: ${msg}` };
       }
     }
@@ -2339,9 +2289,11 @@ var FirebaseSetup = class {
   // ─── Helpers ───────────────────────────────────────────────────────
   execTimeout(command, args, timeoutMs) {
     return new Promise((resolve6, reject) => {
-      const proc = execFile2(command, args, { cwd: this.projectDir, timeout: timeoutMs }, (err, stdout) => {
+      const proc = execFile2(command, args, { cwd: this.projectDir, 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 {
           resolve6(stdout);
         }
@@ -2355,7 +2307,6 @@ var FirebaseSetup = class {
   }
   /** Cleanup resources */
   destroy() {
-    this.cleanupLogin();
   }
 };
 
@@ -3267,17 +3218,20 @@ ${liveReloadScript}
       return;
     }
     if (url.pathname === "/__dev/setup/login" && req.method === "POST") {
-      const session = this.firebaseSetup.startLogin();
-      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 });
+      let body = "";
+      req.on("data", (chunk) => {
+        body += chunk;
+      });
+      req.on("end", () => {
+        let reauth = false;
+        try {
+          const data = JSON.parse(body);
+          reauth = !!data.reauth;
+        } catch {
+        }
+        const result = this.firebaseSetup.openLoginTerminal(reauth);
+        sendJson(result);
+      });
       return;
     }
     if (url.pathname === "/__dev/setup/projects" && req.method === "GET") {