esque-bridge 0.6.9 → 0.6.11

package/index.js

@@ -469,6 +469,26 @@ function runAgent(prompt, esqueSessionId) {
       clearTimers();
       if (truncated) return;
       if (code !== 0) {
+        // A non-zero exit usually still carries the REAL reason. `claude
+        // --print --output-format json` emits a result object with the error
+        // (API overload, usage limit, a refusal) on stdout even when it exits
+        // 1 — surfacing "exited 1" instead throws that away. Parse stdout; if
+        // there's a real message, return it as an error reply (so the phone
+        // shows the cause and the user can just resend) rather than a bare
+        // exit code. Fall back to exit-code + stderr only when stdout is empty.
+        let parsedErr = null;
+        try {
+          const p = adapter.parseOutput(stdout);
+          if (p && p.text && p.text !== '(no output)' && p.text !== '(claude returned no text)') {
+            parsedErr = p;
+          }
+        } catch {
+          /* unparseable stdout — fall through to the generic message */
+        }
+        if (parsedErr) {
+          resolveOnce({ ...parsedErr, isError: true });
+          return;
+        }
         rejectOnce(
           new Error(
             `${adapter.label} exited ${code}${stderr ? `: ${stderr.trim().slice(0, 500)}` : ''}`,
@@ -611,6 +631,32 @@ const { execSync } = require('child_process');
 
 let preview = null; // { port, proc, kind, url, tunnel, tunnelProc }
 
+// ── Preview persistence ───────────────────────────────────────────────
+// Tunnels die with the laptop lid / a bridge restart, and the URL embedded in
+// the phone's chat history can never come back (quick-tunnel URLs are random).
+// Remember each workdir's last preview COMMAND so a restarted bridge can
+// revive the dev server + mint a fresh tunnel — the phone then resolves the
+// current URL via GET /preview instead of trusting the dead one.
+const PREVIEWS_FILE = path.join(os.homedir(), '.esque-bridge-previews.json');
+function savePreviewCmd(cmd, port) {
+  try {
+    let all = {};
+    try { all = JSON.parse(fs.readFileSync(PREVIEWS_FILE, 'utf8')); } catch { /* first run */ }
+    all[WORKDIR] = { cmd, port };
+    fs.writeFileSync(PREVIEWS_FILE, JSON.stringify(all, null, 2));
+  } catch (err) {
+    console.warn('[preview] could not persist preview command:', err.message);
+  }
+}
+function loadPreviewCmd() {
+  try {
+    const all = JSON.parse(fs.readFileSync(PREVIEWS_FILE, 'utf8'));
+    const e = all[WORKDIR];
+    if (e && typeof e.cmd === 'string' && Number.isInteger(e.port)) return e;
+  } catch { /* none saved */ }
+  return null;
+}
+
 // Kill a spawned command's WHOLE process tree. `proc.kill()` alone signals
 // only the immediate child (`sh`/`npm`) — npm does not reliably forward
 // signals, so the actual dev server survives, keeps the port, and the next
@@ -902,6 +948,9 @@ async function startPreview(cmd, port) {
     return { url: null, buildError: deps.error };
   }
   console.log(`[preview] starting: ${cmd}  (port ${port})`);
+  // Remember the command now (not on success): a revival attempt after a
+  // mid-start crash should still know what to run.
+  savePreviewCmd(cmd, port);
   // Own process group (POSIX) so killPreview can take down the WHOLE tree —
   // `npm run dev` does not forward signals to the real dev server. Windows
   // has no `sh`; route through cmd.exe and kill via taskkill /T.
@@ -1202,6 +1251,45 @@ function resultHandler(req, res) {
   res.json({ status: job.status, text: job.text });
 }
 
+// Single-flight wrapper for reviving the saved preview: GET /preview and the
+// boot-time revival can race; both should await the same start, never two.
+let previewStartPromise = null;
+function revivePreview() {
+  if (preview && preview.url) return Promise.resolve({ url: preview.url, buildError: preview.buildError });
+  if (!previewStartPromise) {
+    const saved = loadPreviewCmd();
+    if (!saved) return Promise.resolve(null);
+    console.log('[preview] reviving last preview for this folder…');
+    previewStartPromise = startPreview(saved.cmd, saved.port)
+      .catch((e) => { console.error('[preview] revive failed:', e.message); return null; })
+      .finally(() => { previewStartPromise = null; });
+  }
+  return previewStartPromise;
+}
+
+// Current-preview resolver. The phone calls this when a stored preview URL
+// goes dead (laptop slept → tunnel gone): if the dev server isn't running,
+// we restart the last one for this folder and answer with the FRESH url.
+// Response: { ok, url?, port?, building?, buildError? } — 404 when this
+// folder has never had a preview.
+app.get('/preview', requireAuth, async (_req, res) => {
+  if (preview && preview.url) {
+    return res.json({ ok: true, url: preview.url, port: preview.port, buildError: preview.buildError ?? null });
+  }
+  if (!loadPreviewCmd() && !previewStartPromise) {
+    return res.status(404).json({ ok: false, error: 'no_preview_for_this_folder' });
+  }
+  const result = await revivePreview();
+  if (result && result.url) {
+    return res.json({ ok: true, url: result.url, port: preview?.port ?? null, buildError: result.buildError ?? null });
+  }
+  return res.status(503).json({
+    ok: false,
+    error: 'preview_failed_to_start',
+    buildError: (result && result.buildError) || null,
+  });
+});
+
 app.post('/execute', requireAuth, executeHandler);
 app.post('/', requireAuth, executeHandler);
 app.get('/result/:id', requireAuth, resultHandler);
@@ -1384,6 +1472,11 @@ async function main() {
   console.log('  Press Ctrl-C to stop.');
   console.log('━'.repeat(68));
 
+  // Revive this folder's last preview in the background, so a "Preview
+  // Build" pill already sitting in the phone's chat resolves again right
+  // after a restart (the app asks GET /preview for the fresh URL).
+  if (loadPreviewCmd()) revivePreview();
+
   let shuttingDown = false;
   const shutdown = (signal) => {
     shuttingDown = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esque-bridge",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "description": "Desktop-side receiver for the Esque Agent mobile app. Pairs your phone with a local coding-agent CLI (Claude Code, Codex, Aider, or any custom command) via a tunnel + QR code, so prompts run through your subscription instead of per-token API billing.",
   "bin": {
     "esque-bridge": "index.js"