@1presence/bridge 0.35.0 → 0.37.0

package/dist/claude.js

@@ -6,6 +6,7 @@ exports.setDebug = setDebug;
 exports.paint = paint;
 exports.spawnClaude = spawnClaude;
 exports.killAll = killAll;
+exports.cancelConversation = cancelConversation;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const os_1 = require("os");
@@ -581,3 +582,26 @@ function killAll() {
     }
     active.clear();
 }
+/**
+ * Stop one in-flight turn (the Stop button, relayed by the gateway as a
+ * `cancel` frame). Kills the running Claude Code process for this conversation
+ * and cancels any scheduled retry, so no further stream events are produced.
+ * Mirrors the supersede path in spawnClaude. Returns true if something was
+ * actually stopped. Mechanical only — no product logic lives here.
+ */
+function cancelConversation(conversationId) {
+    let stopped = false;
+    const proc = active.get(conversationId);
+    if (proc) {
+        proc.kill('SIGTERM');
+        active.delete(conversationId);
+        stopped = true;
+    }
+    const pending = pendingRetries.get(conversationId);
+    if (pending) {
+        clearTimeout(pending);
+        pendingRetries.delete(conversationId);
+        stopped = true;
+    }
+    return stopped;
+}

package/dist/index.js

@@ -14,6 +14,7 @@ const config_1 = require("./config");
 const update_1 = require("./update");
 const accumulator_1 = require("./accumulator");
 const outbox_1 = require("./outbox");
+const timer_1 = require("./timer");
 const package_json_1 = require("../package.json");
 // Published tarballs don't ship src/, so this fires only when running the
 // dist build from a live workspace checkout. Catches the trap where editing
@@ -149,6 +150,7 @@ async function handleMessage(conversationId, text, sessionId, history, auth, vau
         // If it's already invalid, MCP calls will 401 mid-turn — fail fast instead.
         if (!(0, auth_1.isTokenValid)(auth.token)) {
             const message = 'Authentication expired and refresh failed — please restart the bridge to sign in again.';
+            (0, timer_1.stopTurnTimer)();
             console.error(`[bridge] ${message} (${err.message})`);
             if (currentWs?.readyState === ws_1.default.OPEN) {
                 currentWs.send(JSON.stringify({ type: 'error', conversationId, message }));
@@ -169,6 +171,7 @@ async function handleMessage(conversationId, text, sessionId, history, auth, vau
     }
     catch (err) {
         const message = `System prompt refresh failed: ${err.message}`;
+        (0, timer_1.stopTurnTimer)();
         console.error(`[${new Date().toLocaleTimeString()}] ✗ ${message}`);
         if (currentWs?.readyState === ws_1.default.OPEN) {
             currentWs.send(JSON.stringify({ type: 'error', conversationId, message }));
@@ -253,12 +256,13 @@ async function handleMessage(conversationId, text, sessionId, history, auth, vau
             }
         },
         onDone: (messageCount, costUsd, usage, model) => {
-            const parts = [];
+            const elapsed = (0, timer_1.stopTurnTimer)();
+            const parts = [(0, timer_1.formatElapsed)(elapsed)];
             if (usage)
                 parts.push(`in:${usage.input_tokens} out:${usage.output_tokens}`);
             const costStr = costUsd === 0 ? '$0.0000 (plan usage)' : `$${costUsd.toFixed(4)}`;
             parts.push(costStr);
-            const suffix = parts.length ? `  ${parts.join('  ')}` : '';
+            const suffix = `  ${parts.join('  ')}`;
             console.log(`[${new Date().toLocaleTimeString()}] ✓ done${suffix}`);
             const mapped = toBridgeUsage(usage);
             if (currentWs?.readyState === ws_1.default.OPEN) {
@@ -275,7 +279,8 @@ async function handleMessage(conversationId, text, sessionId, history, auth, vau
             void finalizeAndPost(buildSpoolRecord(mapped, model));
         },
         onError: (message, usage, model) => {
-            console.error(`[${new Date().toLocaleTimeString()}] ✗ ${message}`);
+            const elapsed = (0, timer_1.stopTurnTimer)();
+            console.error(`[${new Date().toLocaleTimeString()}] ✗ ${message}  (${(0, timer_1.formatElapsed)(elapsed)})`);
             const mapped = toBridgeUsage(usage);
             if (currentWs?.readyState === ws_1.default.OPEN) {
                 currentWs.send(JSON.stringify({
@@ -386,13 +391,24 @@ function connect(auth, retryDelay = 1000) {
             }
             return;
         }
+        // Stop button: the gateway relays a cancel when the user abandons the turn
+        // (PWA→gateway connection dropped). Kill the local Claude Code process for
+        // this conversation so it stops generating instead of running to the end.
+        if (msg.type === 'cancel' && msg.conversationId) {
+            const cancelled = (0, claude_1.cancelConversation)(msg.conversationId);
+            if (cancelled)
+                console.log(`[bridge] ✕ stopped conversation ${msg.conversationId}`);
+            return;
+        }
         if (msg.type !== 'message' || !msg.conversationId || !msg.text)
             return;
         const { conversationId, text, sessionId, history, vaultFileOpen, clientCapabilities, syncedFolders, agentSlug } = msg;
         const ts = new Date().toLocaleTimeString();
         const hist = Array.isArray(history) ? history : [];
         console.log(`[${ts}] ▶ ${text}${hist.length ? `  (history: ${hist.length} turn${hist.length === 1 ? '' : 's'})` : ''}`);
+        (0, timer_1.startTurnTimer)();
         handleMessage(conversationId, text, sessionId ?? null, hist, auth, vaultFileOpen, clientCapabilities, syncedFolders, agentSlug).catch((err) => {
+            (0, timer_1.stopTurnTimer)();
             console.error(`[bridge] handleMessage error: ${err.message}`);
         });
     });

package/dist/timer.js

@@ -0,0 +1,56 @@
+"use strict";
+// Live elapsed-time indicator for the active turn. Writes `\r\x1b[K⏱  Xs`
+// once per second; wraps console.log/error/warn so that any other output
+// clears the timer line before printing, then redraws the timer on the new
+// bottom line. Idempotent — stop is safe to call multiple times.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatElapsed = formatElapsed;
+exports.startTurnTimer = startTurnTimer;
+exports.stopTurnTimer = stopTurnTimer;
+let intervalId = null;
+let startedAt = 0;
+let originalLog = null;
+let originalError = null;
+let originalWarn = null;
+function clearLine() {
+    process.stdout.write('\r\x1b[K');
+}
+function draw() {
+    const elapsedSec = Math.floor((Date.now() - startedAt) / 1000);
+    process.stdout.write(`\r\x1b[K⏱  ${formatElapsed(elapsedSec)}`);
+}
+function formatElapsed(seconds) {
+    if (seconds < 60)
+        return `${seconds}s`;
+    const m = Math.floor(seconds / 60);
+    const s = seconds % 60;
+    return `${m}m ${s.toString().padStart(2, '0')}s`;
+}
+function startTurnTimer() {
+    if (intervalId !== null)
+        return;
+    startedAt = Date.now();
+    originalLog = console.log;
+    originalError = console.error;
+    originalWarn = console.warn;
+    console.log = (...args) => { clearLine(); originalLog(...args); draw(); };
+    console.error = (...args) => { clearLine(); originalError(...args); draw(); };
+    console.warn = (...args) => { clearLine(); originalWarn(...args); draw(); };
+    draw();
+    intervalId = setInterval(draw, 1000);
+}
+function stopTurnTimer() {
+    if (intervalId === null)
+        return 0;
+    clearInterval(intervalId);
+    intervalId = null;
+    clearLine();
+    if (originalLog)
+        console.log = originalLog;
+    if (originalError)
+        console.error = originalError;
+    if (originalWarn)
+        console.warn = originalWarn;
+    originalLog = originalError = originalWarn = null;
+    return Math.floor((Date.now() - startedAt) / 1000);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1presence/bridge",
-  "version": "0.35.0",
+  "version": "0.37.0",
   "description": "Run 1Presence on your Mac and use your Claude.ai Pro subscription from any device",
   "bin": {
     "1presence-bridge": "dist/index.js"