clawfire 0.6.14 → 0.6.15

package/dist/cli.js

@@ -269,7 +269,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-IKWE6UJT.js");
+  const { startDevServer } = await import("./dev-server-3SUUU4D2.js");
   await startDevServer({
     projectDir,
     port,

package/dist/{dev-server-IKWE6UJT.js → dev-server-3SUUU4D2.js}

@@ -1465,9 +1465,9 @@ function generateDashboardHtml(options) {
               <div style="margin-bottom:6px;"><strong style="color:#fbbf24;">Current Plan:</strong> <span style="color:#ef4444;">Spark (Free)</span></div>
               <div style="margin-bottom:6px;"><strong style="color:#fbbf24;">Required Plan:</strong> <span style="color:#22c55e;">Blaze (Pay-as-you-go)</span></div>
               <div style="margin-bottom:10px;color:#a3a3a3;font-size:12px;">
-                Static pages (HTML/CSS/JS) are deployed and working.<br>
+                Static pages (HTML/CSS/JS) are deployed and live.<br>
                 API routes (<code style="background:#2a2a2a;padding:2px 6px;border-radius:3px;color:#f97316;">/api/*</code>) require Cloud Functions, which need the Blaze plan.<br>
-                Blaze plan has a generous free tier \u2014 you only pay for actual usage beyond free limits.
+                Blaze plan has a generous free tier \u2014 you only pay for usage beyond free limits.
               </div>
               <a id="deploy-upgrade-link" href="#" target="_blank" style="display:inline-block;padding:8px 16px;background:#f59e0b;color:#000;border-radius:6px;font-size:13px;font-weight:700;text-decoration:none;">
                 Upgrade to Blaze Plan &#8594;
@@ -2354,13 +2354,12 @@ function generateDashboardHtml(options) {
     var btn = document.getElementById('deploy-hosting-btn');
     var status = document.getElementById('deploy-hosting-status');
     var urlBox = document.getElementById('deploy-hosting-url');
+    var billingNote = document.getElementById('deploy-billing-note');
     btn.disabled = true;
     btn.textContent = 'Deploying...';
-    status.textContent = 'Deploying to Firebase Hosting... This may take up to 2 minutes.';
+    status.textContent = 'Deploying to Firebase Hosting... This may take up to 3 minutes.';
     status.style.cssText = 'display:block;margin-top:10px;font-size:13px;padding:10px 14px;border-radius:6px;background:#0a0a1a;border:1px solid #3b82f6;color:#3b82f6;';
     urlBox.style.display = 'none';
-
-    var billingNote = document.getElementById('deploy-billing-note');
     billingNote.style.display = 'none';
 
     fetch(API + '/__dev/deploy/hosting', { method: 'POST' })
@@ -2375,18 +2374,17 @@ function generateDashboardHtml(options) {
           link.textContent = data.url;
           urlBox.style.display = 'block';
         }
-        // Show Blaze plan notice if needed
+        // Show Blaze plan notice when functions deploy failed
         if (data.blazeRequired) {
           billingNote.style.display = 'block';
           if (data.upgradeUrl) {
-            var upgradeLink = document.getElementById('deploy-upgrade-link');
-            upgradeLink.href = data.upgradeUrl;
+            document.getElementById('deploy-upgrade-link').href = data.upgradeUrl;
           }
         }
       } else {
         status.textContent = data.message;
         status.style.cssText = 'display:block;margin-top:10px;font-size:13px;padding:10px 14px;border-radius:6px;background:#1c0808;border:1px solid #ef4444;color:#ef4444;';
-        // Check if error is about billing \u2014 show upgrade notice
+        // Also check if error is billing-related
         var errMsg = (data.message || '').toLowerCase();
         if (errMsg.indexOf('blaze') >= 0 || errMsg.indexOf('pay-as-you-go') >= 0 || errMsg.indexOf('upgrade') >= 0 || errMsg.indexOf('artifactregistry') >= 0) {
           billingNote.style.display = 'block';
@@ -3421,7 +3419,8 @@ https://console.developers.google.com/apis/api/firestore.googleapis.com/overview
     return new Promise((resolve6, reject) => {
       const proc = execFile2(command, args, { cwd: cwd || this.projectDir, timeout: timeoutMs }, (err, stdout, stderr) => {
         if (err) {
-          const detail = stderr?.trim() || stdout?.trim() || "";
+          const parts = [stderr?.trim(), stdout?.trim()].filter(Boolean);
+          const detail = parts.join("\n");
           const enriched = new Error(`${err.message}${detail ? "\n" + detail : ""}`);
           reject(enriched);
         } else {
@@ -4650,45 +4649,31 @@ ${liveReloadScript}
           }
           steps.push("Hosting deployed");
           let blazeRequired = false;
-          let projectId = "";
           if (deployFunctions) {
             console.log("  Deploying functions...");
             const funcResult = await this.firebaseSetup.deployHosting("functions");
             if (funcResult.success) {
-              console.log(`  \x1B[32m\u2713\x1B[0m Functions deployed`);
+              console.log("  \x1B[32m\u2713\x1B[0m Functions deployed");
               steps.push("Functions deployed");
             } else {
-              const msg = funcResult.message.toLowerCase();
-              if (msg.includes("blaze") || msg.includes("pay-as-you-go") || msg.includes("upgrade") || msg.includes("billing") || msg.includes("artifactregistry")) {
-                blazeRequired = true;
-                const state = this.firebaseSetup.loadState();
-                projectId = state.projectId || firebaseConfig.projectId || "";
-                console.log("  \x1B[33m\u26A0\x1B[0m Functions require Blaze (pay-as-you-go) plan");
-                steps.push("Functions skipped (Blaze plan required)");
-              } else {
-                console.log(`  \x1B[31m\u2717\x1B[0m Functions deploy failed: ${funcResult.message}`);
-                steps.push("Functions deploy failed");
-              }
+              blazeRequired = true;
+              console.log("  \x1B[33m\u26A0\x1B[0m Functions deploy failed (Blaze plan likely required)");
+              steps.push("Functions skipped (Blaze plan required)");
             }
           }
           clearFirebaseStatusCache();
+          const state = this.firebaseSetup.loadState();
+          const projectId = state.projectId || firebaseConfig.projectId || "";
+          const upgradeUrl = projectId ? `https://console.firebase.google.com/project/${projectId}/usage/details` : "https://console.firebase.google.com";
           const stepsStr = steps.length > 0 ? ` (${steps.join(", ")})` : "";
-          if (blazeRequired) {
-            const upgradeUrl = projectId ? `https://console.firebase.google.com/project/${projectId}/usage/details` : "https://console.firebase.google.com";
-            sendJson({
-              success: true,
-              url: hostingResult.url,
-              blazeRequired: true,
-              upgradeUrl,
-              message: `Hosting deployed successfully!${stepsStr}`,
-              billingNote: `Static pages are live, but API routes (/api/*) require Cloud Functions which need the Blaze (pay-as-you-go) plan. Upgrade at: ${upgradeUrl}`
-            });
-          } else {
-            sendJson({
-              ...hostingResult,
-              message: hostingResult.message + stepsStr
-            });
-          }
+          sendJson({
+            success: true,
+            url: hostingResult.url,
+            blazeRequired,
+            upgradeUrl: blazeRequired ? upgradeUrl : void 0,
+            message: `Hosting deployed successfully!${stepsStr}`,
+            billingNote: blazeRequired ? `Static pages are live! But API routes (/api/*) need Cloud Functions, which require the Blaze (pay-as-you-go) plan. Upgrade: ${upgradeUrl}` : void 0
+          });
         } catch (err) {
           sendJson({ success: false, message: err instanceof Error ? err.message : "Failed" }, 500);
         }

package/dist/dev.cjs

@@ -1877,9 +1877,9 @@ function generateDashboardHtml(options) {
               <div style="margin-bottom:6px;"><strong style="color:#fbbf24;">Current Plan:</strong> <span style="color:#ef4444;">Spark (Free)</span></div>
               <div style="margin-bottom:6px;"><strong style="color:#fbbf24;">Required Plan:</strong> <span style="color:#22c55e;">Blaze (Pay-as-you-go)</span></div>
               <div style="margin-bottom:10px;color:#a3a3a3;font-size:12px;">
-                Static pages (HTML/CSS/JS) are deployed and working.<br>
+                Static pages (HTML/CSS/JS) are deployed and live.<br>
                 API routes (<code style="background:#2a2a2a;padding:2px 6px;border-radius:3px;color:#f97316;">/api/*</code>) require Cloud Functions, which need the Blaze plan.<br>
-                Blaze plan has a generous free tier \u2014 you only pay for actual usage beyond free limits.
+                Blaze plan has a generous free tier \u2014 you only pay for usage beyond free limits.
               </div>
               <a id="deploy-upgrade-link" href="#" target="_blank" style="display:inline-block;padding:8px 16px;background:#f59e0b;color:#000;border-radius:6px;font-size:13px;font-weight:700;text-decoration:none;">
                 Upgrade to Blaze Plan &#8594;
@@ -2766,13 +2766,12 @@ function generateDashboardHtml(options) {
     var btn = document.getElementById('deploy-hosting-btn');
     var status = document.getElementById('deploy-hosting-status');
     var urlBox = document.getElementById('deploy-hosting-url');
+    var billingNote = document.getElementById('deploy-billing-note');
     btn.disabled = true;
     btn.textContent = 'Deploying...';
-    status.textContent = 'Deploying to Firebase Hosting... This may take up to 2 minutes.';
+    status.textContent = 'Deploying to Firebase Hosting... This may take up to 3 minutes.';
     status.style.cssText = 'display:block;margin-top:10px;font-size:13px;padding:10px 14px;border-radius:6px;background:#0a0a1a;border:1px solid #3b82f6;color:#3b82f6;';
     urlBox.style.display = 'none';
-
-    var billingNote = document.getElementById('deploy-billing-note');
     billingNote.style.display = 'none';
 
     fetch(API + '/__dev/deploy/hosting', { method: 'POST' })
@@ -2787,18 +2786,17 @@ function generateDashboardHtml(options) {
           link.textContent = data.url;
           urlBox.style.display = 'block';
         }
-        // Show Blaze plan notice if needed
+        // Show Blaze plan notice when functions deploy failed
         if (data.blazeRequired) {
           billingNote.style.display = 'block';
           if (data.upgradeUrl) {
-            var upgradeLink = document.getElementById('deploy-upgrade-link');
-            upgradeLink.href = data.upgradeUrl;
+            document.getElementById('deploy-upgrade-link').href = data.upgradeUrl;
           }
         }
       } else {
         status.textContent = data.message;
         status.style.cssText = 'display:block;margin-top:10px;font-size:13px;padding:10px 14px;border-radius:6px;background:#1c0808;border:1px solid #ef4444;color:#ef4444;';
-        // Check if error is about billing \u2014 show upgrade notice
+        // Also check if error is billing-related
         var errMsg = (data.message || '').toLowerCase();
         if (errMsg.indexOf('blaze') >= 0 || errMsg.indexOf('pay-as-you-go') >= 0 || errMsg.indexOf('upgrade') >= 0 || errMsg.indexOf('artifactregistry') >= 0) {
           billingNote.style.display = 'block';
@@ -3833,7 +3831,8 @@ https://console.developers.google.com/apis/api/firestore.googleapis.com/overview
     return new Promise((resolve7, reject) => {
       const proc = (0, import_node_child_process2.execFile)(command, args, { cwd: cwd || this.projectDir, timeout: timeoutMs }, (err, stdout, stderr) => {
         if (err) {
-          const detail = stderr?.trim() || stdout?.trim() || "";
+          const parts = [stderr?.trim(), stdout?.trim()].filter(Boolean);
+          const detail = parts.join("\n");
           const enriched = new Error(`${err.message}${detail ? "\n" + detail : ""}`);
           reject(enriched);
         } else {
@@ -5062,45 +5061,31 @@ ${liveReloadScript}
           }
           steps.push("Hosting deployed");
           let blazeRequired = false;
-          let projectId = "";
           if (deployFunctions) {
             console.log("  Deploying functions...");
             const funcResult = await this.firebaseSetup.deployHosting("functions");
             if (funcResult.success) {
-              console.log(`  \x1B[32m\u2713\x1B[0m Functions deployed`);
+              console.log("  \x1B[32m\u2713\x1B[0m Functions deployed");
               steps.push("Functions deployed");
             } else {
-              const msg = funcResult.message.toLowerCase();
-              if (msg.includes("blaze") || msg.includes("pay-as-you-go") || msg.includes("upgrade") || msg.includes("billing") || msg.includes("artifactregistry")) {
-                blazeRequired = true;
-                const state = this.firebaseSetup.loadState();
-                projectId = state.projectId || firebaseConfig.projectId || "";
-                console.log("  \x1B[33m\u26A0\x1B[0m Functions require Blaze (pay-as-you-go) plan");
-                steps.push("Functions skipped (Blaze plan required)");
-              } else {
-                console.log(`  \x1B[31m\u2717\x1B[0m Functions deploy failed: ${funcResult.message}`);
-                steps.push("Functions deploy failed");
-              }
+              blazeRequired = true;
+              console.log("  \x1B[33m\u26A0\x1B[0m Functions deploy failed (Blaze plan likely required)");
+              steps.push("Functions skipped (Blaze plan required)");
             }
           }
           clearFirebaseStatusCache();
+          const state = this.firebaseSetup.loadState();
+          const projectId = state.projectId || firebaseConfig.projectId || "";
+          const upgradeUrl = projectId ? `https://console.firebase.google.com/project/${projectId}/usage/details` : "https://console.firebase.google.com";
           const stepsStr = steps.length > 0 ? ` (${steps.join(", ")})` : "";
-          if (blazeRequired) {
-            const upgradeUrl = projectId ? `https://console.firebase.google.com/project/${projectId}/usage/details` : "https://console.firebase.google.com";
-            sendJson({
-              success: true,
-              url: hostingResult.url,
-              blazeRequired: true,
-              upgradeUrl,
-              message: `Hosting deployed successfully!${stepsStr}`,
-              billingNote: `Static pages are live, but API routes (/api/*) require Cloud Functions which need the Blaze (pay-as-you-go) plan. Upgrade at: ${upgradeUrl}`
-            });
-          } else {
-            sendJson({
-              ...hostingResult,
-              message: hostingResult.message + stepsStr
-            });
-          }
+          sendJson({
+            success: true,
+            url: hostingResult.url,
+            blazeRequired,
+            upgradeUrl: blazeRequired ? upgradeUrl : void 0,
+            message: `Hosting deployed successfully!${stepsStr}`,
+            billingNote: blazeRequired ? `Static pages are live! But API routes (/api/*) need Cloud Functions, which require the Blaze (pay-as-you-go) plan. Upgrade: ${upgradeUrl}` : void 0
+          });
         } catch (err) {
           sendJson({ success: false, message: err instanceof Error ? err.message : "Failed" }, 500);
         }