clawfire 0.4.0 → 0.4.1

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-DRZ52WIA.js");
   await startDevServer({
     projectDir,
     port,

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

@@ -1189,10 +1189,10 @@ 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;">
@@ -1202,14 +1202,27 @@ function generateDashboardHtml(options) {
           <!-- 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;">
             <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>
+              <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: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>
+            <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>
             </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 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>
           <div id="login-result" style="display:none;margin-top:8px;font-size:13px;padding:8px 12px;border-radius:6px;"></div>
         </div>
@@ -1260,7 +1273,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>
@@ -1533,7 +1546,7 @@ 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() {
+  window.startFirebaseLogin = function(reauth) {
     var loginBtn = document.getElementById('login-btn');
     var reauthBtn = document.getElementById('reauth-btn');
     var cancelBtn = document.getElementById('cancel-login-btn');
@@ -1546,8 +1559,14 @@ function generateDashboardHtml(options) {
     progress.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' })
+    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
@@ -1572,9 +1591,17 @@ function generateDashboardHtml(options) {
         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 = state.authUrl.length > 80 ? state.authUrl.slice(0, 80) + '...' : 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
@@ -1617,6 +1644,45 @@ function generateDashboardHtml(options) {
     }, 1500);
   }
 
+  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() {});
@@ -2089,14 +2155,16 @@ 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 { existsSync as existsSync5, readFileSync as readFileSync4, writeFileSync as writeFileSync2, mkdirSync } from "fs";
+import { resolve as resolve4, join as join3, dirname as dirname2 } from "path";
+import { homedir } from "os";
 var FirebaseSetup = class {
   projectDir;
   loginProcess = null;
   loginSession = {
     active: false,
     authUrl: null,
+    waitingForCode: false,
     completed: false,
     error: null,
     output: ""
@@ -2164,7 +2232,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,21 +2249,56 @@ 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 = homedir();
+      const configPath = join3(home, ".config", "configstore", "firebase-tools.json");
+      if (existsSync5(configPath)) {
+        const config = JSON.parse(readFileSync4(configPath, "utf-8"));
+        if (config.usage === void 0) {
+          config.usage = false;
+          writeFileSync2(configPath, JSON.stringify(config, null, 2), "utf-8");
+        }
+      } else {
+        const dir = dirname2(configPath);
+        mkdirSync(dir, { recursive: true });
+        writeFileSync2(configPath, JSON.stringify({ usage: false }, null, 2), "utf-8");
+      }
+    } catch {
+    }
+  }
   // ─── Login Flow ────────────────────────────────────────────────────
-  startLogin() {
+  /**
+   * Start login using `firebase login --no-localhost`.
+   *
+   * 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()
+   */
+  startLogin(reauth = false) {
     this.cleanupLogin();
+    this.ensureAnalyticsConfigured();
     this.loginSession = {
       active: true,
       authUrl: null,
+      waitingForCode: false,
       completed: false,
       error: null,
       output: ""
     };
     try {
-      const proc = spawn("firebase", ["login", "--reauth"], {
+      const args = reauth ? ["login", "--reauth", "--no-localhost"] : ["login", "--no-localhost"];
+      const proc = spawn("firebase", args, {
         cwd: this.projectDir,
         stdio: ["pipe", "pipe", "pipe"],
-        env: { ...process.env }
+        env: { ...process.env, TERM: "dumb" }
       });
       this.loginProcess = proc;
       const appendOutput = (data) => {
@@ -2204,16 +2307,14 @@ var FirebaseSetup = class {
         const urlMatch = text.match(/(https:\/\/accounts\.google\.com\S+)/);
         if (urlMatch) {
           this.loginSession.authUrl = urlMatch[1];
+          this.loginSession.waitingForCode = true;
         }
-        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")) {
+        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("analytics")) {
+        if (text.includes("Allow Firebase to collect") || text.includes("(Y/n)")) {
           try {
             proc.stdin?.write("n\n");
           } catch {
@@ -2224,10 +2325,13 @@ var FirebaseSetup = class {
       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) {
-          this.loginSession.error = `Login process exited with code ${code}`;
+          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;
       });
@@ -2251,6 +2355,25 @@ var FirebaseSetup = class {
   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.";
@@ -2268,6 +2391,7 @@ var FirebaseSetup = class {
       this.loginTimeout = null;
     }
     this.loginSession.active = false;
+    this.loginSession.waitingForCode = false;
   }
   // ─── Project Listing ───────────────────────────────────────────────
   async listProjects() {
@@ -2275,7 +2399,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 +2415,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 +2450,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 +2459,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 +2467,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);
         }
@@ -3267,8 +3397,20 @@ ${liveReloadScript}
       return;
     }
     if (url.pathname === "/__dev/setup/login" && req.method === "POST") {
-      const session = this.firebaseSetup.startLogin();
-      sendJson(session);
+      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 session = this.firebaseSetup.startLogin(reauth);
+        sendJson(session);
+      });
       return;
     }
     if (url.pathname === "/__dev/setup/login-state" && req.method === "GET") {
@@ -3280,6 +3422,25 @@ ${liveReloadScript}
       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);
+        }
+      });
+      return;
+    }
     if (url.pathname === "/__dev/setup/projects" && req.method === "GET") {
       this.firebaseSetup.listProjects().then((result) => sendJson(result)).catch((err) => sendJson({ projects: [], error: err instanceof Error ? err.message : "Failed" }, 500));
       return;