forge-remote 0.1.3 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-remote",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "Desktop relay for Forge Remote — monitor and control Claude Code sessions from your phone",
   "type": "module",
   "license": "UNLICENSED",

package/src/google-auth.js

@@ -80,6 +80,47 @@ export async function getAccessToken() {
   return data.access_token;
 }
 
+// ─── Web App SDK Config ─────────────────────────────────────────────────────
+
+/**
+ * Fetch the Firebase web app SDK config via REST API.
+ * This bypasses the `firebase apps:sdkconfig` CLI command, which sometimes
+ * returns 403 on newly created projects.
+ *
+ * Returns an object with apiKey, authDomain, projectId, storageBucket,
+ * messagingSenderId, and appId — or throws on failure.
+ */
+export async function getWebAppConfig(projectId, appId) {
+  const token = await getAccessToken();
+
+  const response = await fetch(
+    `https://firebase.googleapis.com/v1beta1/projects/${projectId}/webApps/${appId}/config`,
+    {
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "X-Goog-User-Project": projectId,
+      },
+    },
+  );
+
+  if (!response.ok) {
+    const err = await response.json().catch(() => ({}));
+    throw new Error(
+      `Failed to fetch web app config: ${err.error?.message || response.statusText}`,
+    );
+  }
+
+  const data = await response.json();
+  return {
+    apiKey: data.apiKey || null,
+    authDomain: data.authDomain || null,
+    projectId: data.projectId || null,
+    storageBucket: data.storageBucket || null,
+    messagingSenderId: data.messagingSenderId || null,
+    appId: data.appId || null,
+  };
+}
+
 // ─── Anonymous Authentication ───────────────────────────────────────────────
 
 /**

package/src/init.js

@@ -15,6 +15,7 @@ import chalk from "chalk";
 
 import {
   readRefreshToken,
+  getWebAppConfig,
   enableAnonymousAuth,
   enableApi,
   findFirebaseAdminSdkAccount,
@@ -426,50 +427,58 @@ export async function runInit({ projectId: overrideProjectId } = {}) {
 
   console.log(chalk.green(`  ✓ App ID: ${appId}`));
 
-  // Get SDK config.
+  // Get SDK config via REST API (bypasses flaky `firebase apps:sdkconfig` CLI).
   let sdkConfig = {};
 
   try {
-    const sdkOutput = runOrFail(
-      ["firebase", "apps:sdkconfig", "web", appId, "--project", projectId],
-      "Failed to get SDK config.",
-    );
+    // Primary method: REST API with retry for newly created apps.
+    const maxSdkRetries = 4;
+    const retryDelayMs = 5000; // 5 seconds between retries.
 
-    // Parse the config — output may be JSON or JS object.
-    const jsonMatch = sdkOutput.match(/\{[\s\S]*\}/);
-    if (jsonMatch) {
+    for (let attempt = 1; attempt <= maxSdkRetries; attempt++) {
       try {
-        const parsed = JSON.parse(jsonMatch[0]);
-        sdkConfig = {
-          apiKey: parsed.apiKey || null,
-          authDomain: parsed.authDomain || null,
-          projectId: parsed.projectId || null,
-          storageBucket: parsed.storageBucket || null,
-          messagingSenderId: parsed.messagingSenderId || null,
-          appId: parsed.appId || null,
-        };
-      } catch {
-        // Not valid JSON — fall back to regex.
-        const parseField = (field) => {
-          const regex = new RegExp(`"?${field}"?:\\s*"([^"]+)"`);
-          const match = sdkOutput.match(regex);
-          return match ? match[1] : null;
-        };
-        sdkConfig = {
-          apiKey: parseField("apiKey"),
-          authDomain: parseField("authDomain"),
-          projectId: parseField("projectId"),
-          storageBucket: parseField("storageBucket"),
-          messagingSenderId: parseField("messagingSenderId"),
-          appId: parseField("appId"),
-        };
+        sdkConfig = await getWebAppConfig(projectId, appId);
+        break; // Success — exit retry loop.
+      } catch (e) {
+        if (attempt < maxSdkRetries) {
+          console.log(
+            chalk.yellow(
+              `  ⚠ SDK config not available yet (attempt ${attempt}/${maxSdkRetries}). ` +
+                `Retrying in ${retryDelayMs / 1000}s...`,
+            ),
+          );
+          await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
+        } else {
+          throw new Error(
+            `Could not retrieve SDK config after ${maxSdkRetries} attempts.\n` +
+              `  Last error: ${e.message}\n\n` +
+              chalk.bold("  Try these steps:\n\n") +
+              chalk.cyan(
+                `  1. Wait 30 seconds, then re-run: forge-remote init\n`,
+              ) +
+              chalk.cyan(
+                `  2. Or get the config from the Firebase Console:\n`,
+              ) +
+              chalk.dim(
+                `     https://console.firebase.google.com/project/${projectId}/settings/general\n`,
+              ) +
+              chalk.dim(
+                `     Scroll to "Your apps" → Web app → Config snippet\n`,
+              ) +
+              chalk.dim(`     Save it to: ~/.forge-remote/sdk-config.json\n`) +
+              chalk.dim(
+                `     Format: { "apiKey": "...", "authDomain": "...", "projectId": "...",\n`,
+              ) +
+              chalk.dim(
+                `              "storageBucket": "...", "messagingSenderId": "...", "appId": "..." }\n`,
+              ),
+          );
+        }
       }
     }
 
     if (!sdkConfig.apiKey || !sdkConfig.projectId) {
-      throw new Error(
-        "Could not parse apiKey or projectId from SDK config output.",
-      );
+      throw new Error("SDK config is missing apiKey or projectId.");
     }
 
     console.log(chalk.green("  ✓ SDK config retrieved"));

package/src/session-manager.js

@@ -279,9 +279,14 @@ async function handleDesktopCommand(desktopId, commandDoc) {
 
   try {
     switch (data.type) {
-      case "start_session":
-        await startNewSession(desktopId, data.payload);
-        break;
+      case "start_session": {
+        const sessionId = await startNewSession(desktopId, data.payload);
+        await cmdRef.update({
+          status: "completed",
+          result: { sessionId },
+        });
+        return; // Skip generic completed update below
+      }
       case "rescan_projects": {
         const { scanProjects } = await import("./project-scanner.js");
         const { updateProjects } = await import("./desktop.js");