pushary 1.9.71 → 1.9.73

package/dist/bin/pushary-claude.js

@@ -2,43 +2,50 @@
 import {
   WRAPPER_ACTIVE_ENV,
   findClaudeBinary
-} from "../chunk-YX6VQGLG.js";
+} from "../chunk-U3EBM73X.js";
+import {
+  CommandReceipts,
+  controllerCommandSchema
+} from "../chunk-N5P2FLOJ.js";
+import {
+  external_exports
+} from "../chunk-XMSDA5WA.js";
 import {
   SESSION_IDLE_TIMEOUT_MS,
   describeIdleWindow,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-ITKAMUHG.js";
-import "../chunk-BJRLJJS2.js";
+} from "../chunk-PNXNWZ5P.js";
+import "../chunk-TFDMJHAB.js";
 import {
   announceSubscriptionRequired,
   isDeferAnswer
-} from "../chunk-3CN2EFKK.js";
+} from "../chunk-AXZ67XVN.js";
 import {
   claudeTranscriptPath,
   loadSessionKey,
   registerTranscript,
   registeredTranscriptEnabled
-} from "../chunk-IYMYGKFB.js";
-import "../chunk-FTOKESSK.js";
+} from "../chunk-AC5TVOAH.js";
+import "../chunk-FB262EOM.js";
 import {
   ensureDaemonRunning
-} from "../chunk-G3J5JKEJ.js";
-import "../chunk-WOZLV3LN.js";
-import "../chunk-EVJRITSI.js";
-import "../chunk-MZ6GL46A.js";
+} from "../chunk-WJJVCDEU.js";
+import "../chunk-QAWWTRDD.js";
+import "../chunk-2HFC4W6J.js";
+import "../chunk-BLX6KRK5.js";
 import "../chunk-NMUI3ZWG.js";
 import {
   encryptRecord
-} from "../chunk-LA3MMHLO.js";
+} from "../chunk-JC7XUZST.js";
 import {
   transcriptsEnabled
-} from "../chunk-TATE22GH.js";
+} from "../chunk-S63VIM7E.js";
 import {
   needsShell,
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
-import "../chunk-D536PHXF.js";
+import "../chunk-NGNBX3YH.js";
 import {
   DEFAULT_SESSION,
   UNNAMED_ACTION,
@@ -55,10 +62,10 @@ import {
   reportEvent,
   savePendingCommand,
   scopePathFor
-} from "../chunk-5NQ3SMVP.js";
+} from "../chunk-AJWGZJFS.js";
 import {
   repoKeyFor
-} from "../chunk-NPO3ZTR4.js";
+} from "../chunk-QMPM3CAN.js";
 import {
   askUser,
   cancelQuestion,
@@ -70,30 +77,30 @@ import {
   waitForAnswer,
   waitsForThePhone,
   withdrawQuestion
-} from "../chunk-YG3NFC5N.js";
+} from "../chunk-CMYFV3VC.js";
 import "../chunk-POFBE6ZY.js";
 import {
   SubscriptionRequiredError
-} from "../chunk-GIE7PLZD.js";
-import "../chunk-ZZ7VB6QC.js";
-import "../chunk-XSUWXBHF.js";
+} from "../chunk-7M4AA7QF.js";
+import "../chunk-S7VMHSJW.js";
+import "../chunk-O4EAMVSC.js";
 import {
   getMachineId
-} from "../chunk-LWAYXE7G.js";
+} from "../chunk-UUCRWEEU.js";
 import "../chunk-PPY5N2E6.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-AERRQEWZ.js";
+import "../chunk-7FROPPIH.js";
 import {
   claudeConfigDir
-} from "../chunk-SMIU5URV.js";
-import "../chunk-T7FPZN5V.js";
+} from "../chunk-7S46LCKD.js";
+import "../chunk-RZVWEDIS.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-X2KK42JA.js";
+} from "../chunk-R5PZPROX.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-AZ56FPRG.js";
+} from "../chunk-PPKIL4EL.js";
 import "../chunk-QTOLNRET.js";
 import {
   DECISION_STOP_REASON,
@@ -101,12 +108,13 @@ import {
   KILL_REASON,
   SESSION_PAUSED_REASON,
   UNVERIFIABLE_APPROVAL_REASON,
+  extractMessageText,
   questionLimitHandBack,
   redactSecretsFromContent,
   refusesWhenUnanswered,
   resolveGate,
   timeoutActionWithoutLocalPrompt
-} from "../chunk-JGEPODEP.js";
+} from "../chunk-AVHL2ZTS.js";
 import "../chunk-MLKGABMK.js";
 
 // src/wrapper/localPassthrough.ts
@@ -153,6 +161,36 @@ var runLocalPassthrough = (binary, args2) => {
   });
 };
 
+// src/wrapper/command-history.ts
+import { open } from "fs/promises";
+var userRecord = external_exports.object({ type: external_exports.literal("user"), uuid: external_exports.string(), message: external_exports.object({ role: external_exports.literal("user") }) });
+var MAX_HISTORY_BYTES = 16 * 1024 * 1024;
+var historyAcceptedCommand = async (file, commandId) => {
+  try {
+    const handle = await open(file, "r");
+    try {
+      const stat = await handle.stat();
+      const start = Math.max(0, stat.size - MAX_HISTORY_BYTES);
+      const buffer = Buffer.alloc(Math.min(stat.size, MAX_HISTORY_BYTES));
+      const { bytesRead } = await handle.read(buffer, 0, buffer.length, start);
+      const lines = buffer.subarray(0, bytesRead).toString("utf8").split("\n");
+      for (const line of start ? lines.slice(1) : lines) {
+        try {
+          const record = userRecord.safeParse(JSON.parse(line));
+          if (record.success && record.data.uuid === commandId) return true;
+        } catch {
+          continue;
+        }
+      }
+    } finally {
+      await handle.close();
+    }
+  } catch {
+    return false;
+  }
+  return false;
+};
+
 // src/wrapper/dualMode.ts
 import { existsSync as existsSync2 } from "fs";
 
@@ -170,6 +208,7 @@ var redactDraft = (text, complete = false) => {
   }
   return redactSecretsFromContent(text.slice(0, end));
 };
+var isDraftObject = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 var DraftText = class {
   messageId = "";
   text = "";
@@ -177,18 +216,28 @@ var DraftText = class {
   interrupted = false;
   add(message) {
     if (message.parent_tool_use_id) return;
-    const event = message.event;
+    const event = isDraftObject(message.event) ? message.event : null;
     if (message.type === "stream_event" && event?.type === "message_start") {
-      this.messageId = event.message?.id ?? "";
+      const start = isDraftObject(event.message) ? event.message : null;
+      this.messageId = typeof start?.id === "string" ? start.id : "";
       this.text = "";
       this.complete = false;
       this.interrupted = false;
-    } else if (message.type === "stream_event" && event?.type === "content_block_delta" && event.delta?.type === "text_delta") {
-      this.text = (this.text + (event.delta.text ?? "")).slice(0, 32 * 1024);
-    } else if (message.type === "assistant") {
+    } else if (message.type === "stream_event" && event?.type === "content_block_start") {
+      const block = isDraftObject(event.content_block) ? event.content_block : null;
+      if (block?.type === "text") {
+        const separator = this.text.length > 0 ? "\n" : "";
+        this.text = (this.text + separator + (typeof block.text === "string" ? block.text : "")).slice(0, 32 * 1024);
+      }
+    } else if (message.type === "stream_event" && event?.type === "content_block_delta") {
+      const delta = isDraftObject(event.delta) ? event.delta : null;
+      if (delta?.type === "text_delta" && typeof delta.text === "string") {
+        this.text = (this.text + delta.text).slice(0, 32 * 1024);
+      }
+    } else if (message.type === "assistant" && isDraftObject(message.message)) {
       const body = message.message;
-      if (body?.id === this.messageId && Array.isArray(body.content)) {
-        this.text = body.content.filter((block) => block.type === "text").map((block) => block.text).join("").slice(0, 32 * 1024);
+      if (body.id === this.messageId && (Array.isArray(body.content) || typeof body.content === "string")) {
+        this.text = extractMessageText(body.content).slice(0, 32 * 1024);
         this.complete = true;
       }
     }
@@ -201,7 +250,7 @@ var DraftText = class {
     return this.messageId && text ? { messageId: this.messageId, text, status: this.interrupted ? "interrupted" : this.complete ? "complete" : "streaming" } : null;
   }
 };
-var startTranscriptDraft = (apiKey, getSessionId) => {
+var startTranscriptDraft = (apiKey, getSessionId, runtime = {}) => {
   const text = new DraftText();
   const startedAt = Date.now();
   let revision = 0;
@@ -210,17 +259,17 @@ var startTranscriptDraft = (apiKey, getSessionId) => {
   let ending = false;
   let sent = "";
   const flush = async () => {
-    if (stopped || pending || !transcriptsEnabled()) return;
+    if (stopped || pending || !(runtime.enabled ?? transcriptsEnabled)()) return;
     const sessionId = getSessionId();
     const snapshot = text.snapshot();
-    if (!sessionId || !snapshot || !registeredTranscriptEnabled(apiKey, sessionId)) return;
+    if (!sessionId || !snapshot || !(runtime.registered ? runtime.registered(sessionId) : registeredTranscriptEnabled(apiKey, sessionId))) return;
     const raw = JSON.stringify(snapshot);
     if (raw === sent) return;
-    const key = loadSessionKey(sessionId);
+    const key = loadSessionKey(sessionId, runtime.keyDirectory);
     if (!key?.keyUploaded) return;
     pending = (async () => {
       try {
-        const response = await fetch(`${getBaseUrl()}/api/agent/transcript`, {
+        const response = await fetch(`${runtime.baseUrl ?? getBaseUrl()}/api/agent/transcript`, {
           method: "POST",
           headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
           body: JSON.stringify({ sessionId, draft: { startedAt, revision: ++revision, content: encryptRecord(raw, key.sessionKey) } }),
@@ -236,7 +285,7 @@ var startTranscriptDraft = (apiKey, getSessionId) => {
       pending = void 0;
     }
   };
-  const timer = setInterval(() => void flush(), 800);
+  const timer = setInterval(() => void flush(), 500);
   timer.unref();
   return {
     add: (message) => {
@@ -284,6 +333,7 @@ var importSdk = async (specifierOrUrl) => {
   }
 };
 var loadClaudeSdk = async () => {
+  if (process.env.PUSHARY_REMOTE_SDK_DIR?.trim()) return importSdk(pathToFileURL(cachedSdkEntry()).href);
   const fromResolution = await importSdk(SDK_PACKAGE);
   if (fromResolution) return fromResolution;
   const entry = cachedSdkEntry();
@@ -713,7 +763,10 @@ var startCommandPoller = (opts) => {
         command = drained.command;
       }
       errorStreak = 0;
-      if (command) {
+      if (command && typeof command !== "string" && command.receipt && opts.onClaimedCommand) {
+        idleTicks = 0;
+        await opts.onClaimedCommand(command.receipt.command, command.receipt.acknowledge);
+      } else if (command) {
         idleTicks = 0;
         const text = typeof command === "string" ? command : command.text;
         let accepted = false;
@@ -743,6 +796,11 @@ var startCommandPoller = (opts) => {
   schedule(fast);
   opts.log?.("[pushary] command poller active");
   return {
+    wake() {
+      if (stopped || inflight) return;
+      if (timer) clearTimeout(timer);
+      schedule(1);
+    },
     stop() {
       stopped = true;
       if (timer) clearTimeout(timer);
@@ -754,11 +812,11 @@ var startCommandPoller = (opts) => {
 
 // src/wrapper/pollClient.ts
 var APPROVAL_MODES = /* @__PURE__ */ new Set(["push_only", "terminal_only", "push_first", "notify_only"]);
-var pollAgent = async (apiKey, sessionId, wantCommand, signal, baseUrl = getBaseUrl(), machineId, controlMode, takeoverDeclined) => {
+var pollAgent = async (apiKey, sessionId, wantCommand, signal, baseUrl = getBaseUrl(), machineId, controlMode, takeoverDeclined, durableReceipts = false) => {
   try {
     const sessionKey = sessionId || DEFAULT_SESSION;
     const receiptNamespace = `${apiKey}:${machineId}:claude_code`;
-    let storedCommand = machineId ? readPendingCommand(sessionKey, receiptNamespace) : null;
+    let storedCommand = machineId && !durableReceipts ? readPendingCommand(sessionKey, receiptNamespace) : null;
     let acknowledgedCommandId = null;
     const acknowledge = async (id, state) => {
       const persisted = state === "delivered" ? markPendingCommandDelivered(sessionKey, id, receiptNamespace) : markPendingCommandFailed(sessionKey, id, receiptNamespace);
@@ -797,6 +855,7 @@ var pollAgent = async (apiKey, sessionId, wantCommand, signal, baseUrl = getBase
       headers: { "Content-Type": "application/json", Authorization: `Bearer ${apiKey}` },
       body: JSON.stringify({
         ...sessionId ? { sessionId } : {},
+        ...durableReceipts ? { receiptVersion: 1 } : {},
         ...controlMode ? { controlMode } : {},
         ...takeoverDeclined ? { takeoverDeclined } : {},
         ...machineId ? { machineId } : {},
@@ -815,6 +874,24 @@ var pollAgent = async (apiKey, sessionId, wantCommand, signal, baseUrl = getBase
     let command = typeof data.command === "string" && data.command.length > 0 ? data.command : null;
     if (storedCommand) {
       command = storedCommand.delivered || storedCommand.failed ? null : claimedCommand(storedCommand.id, storedCommand.text);
+    } else if (durableReceipts) {
+      const parsed = controllerCommandSchema.safeParse(data.command);
+      if (parsed.success && machineId) {
+        const acknowledge2 = async (state, dispatchId) => {
+          try {
+            const result = await fetch(`${baseUrl}/api/agent/command/ack`, {
+              method: "POST",
+              headers: { "Content-Type": "application/json", Authorization: `Bearer ${apiKey}` },
+              body: JSON.stringify({ commandId: parsed.data.id, sessionId, machineId, state, dispatchId }),
+              signal: AbortSignal.timeout(5e3)
+            });
+            return result.ok;
+          } catch {
+            return false;
+          }
+        };
+        command = { ...parsed.data, receipt: { command: parsed.data, acknowledge: acknowledge2 } };
+      } else command = null;
     } else if (data.command && typeof data.command === "object") {
       const claimed = data.command;
       if (typeof claimed.id === "string" && typeof claimed.text === "string" && claimed.id !== acknowledgedCommandId) {
@@ -944,7 +1021,7 @@ var createRelayClient = (options) => {
     return true;
   };
   const sendFrame = (frame) => {
-    if (!socket || !isConnected) return;
+    if (!socket) return;
     try {
       socket.send(encodeFrame(frame));
     } catch {
@@ -978,9 +1055,15 @@ var createRelayClient = (options) => {
     switch (frame.t) {
       case "welcome":
         attempt = 0;
+        isConnected = true;
+        options.onCommandAvailable?.();
         log("[pushary] relay connected");
         break;
       case "command":
+        if (options.onCommandAvailable) {
+          options.onCommandAvailable();
+          break;
+        }
         if (pendingCommands.has(frame.id)) {
           await pendingCommands.get(frame.id);
           acknowledgeStored(frame.id);
@@ -1050,9 +1133,11 @@ var createRelayClient = (options) => {
     if (pongTimer) clearTimeout(pongTimer);
     heartbeatTimer = void 0;
     pongTimer = void 0;
-    if (socket) {
+    const previous = socket;
+    socket = void 0;
+    if (previous) {
       try {
-        socket.close();
+        previous.close();
       } catch {
       }
     }
@@ -1090,13 +1175,15 @@ var createRelayClient = (options) => {
     }
     socket = created;
     created.onOpen(() => {
-      isConnected = true;
+      if (socket !== created || stopped) return;
       sendHello();
       startHeartbeat();
     });
-    created.onMessage((data) => onServerFrame(data));
+    created.onMessage((data) => {
+      if (socket === created && !stopped) void onServerFrame(data);
+    });
     created.onClose(() => {
-      if (stopped) return;
+      if (stopped || socket !== created) return;
       dropAndReconnect();
     });
     created.onError(() => {
@@ -1375,6 +1462,7 @@ var runRemoteLoop = async (deps) => {
         options: {
           resume: resumeId,
           includePartialMessages: true,
+          extraArgs: { "replay-user-messages": null },
           permissionMode: deps.permissionMode,
           model: deps.model,
           settings: deps.settings,
@@ -1423,7 +1511,7 @@ var runRemoteLoop = async (deps) => {
             return ended(1, "failed");
           }
           resumeId = message.session_id;
-          deps.onSessionId?.(resumeId);
+          await deps.onSessionId?.(resumeId);
         }
         if (message.type === "result" && typeof message.total_cost_usd === "number") {
           totalCost = message.total_cost_usd;
@@ -1479,7 +1567,7 @@ var runRemoteLeg = async (session, sdk, deps = {}) => {
   };
   session.setActiveLeg(control);
   session.stdin.captureForWrapper((data) => {
-    if (data.includes(CTRL_RIGHT_BRACKET)) {
+    if (deps.allowLocalHandoff !== false && data.includes(CTRL_RIGHT_BRACKET)) {
       switchBack = true;
       if (!legAbort.signal.aborted) legAbort.abort();
     } else if (data.includes(CTRL_C)) {
@@ -1487,7 +1575,7 @@ var runRemoteLeg = async (session, sdk, deps = {}) => {
     }
   });
   process.stderr.write(
-    "[pushary] remote \u2014 driving from your phone \xB7 press Ctrl-] for the local terminal\n"
+    deps.allowLocalHandoff === false ? "[pushary] ready for phone control \xB7 Ctrl-C stops this session\n" : "[pushary] remote \u2014 driving from your phone \xB7 press Ctrl-] for the local terminal\n"
   );
   let exitCode = 0;
   try {
@@ -1522,7 +1610,7 @@ var runRemoteLeg = async (session, sdk, deps = {}) => {
     session.stdin.releaseToChild();
     session.setActiveLeg(null);
   }
-  if (idleEnded && attended) {
+  if (idleEnded && attended && deps.allowLocalHandoff !== false) {
     process.stderr.write("[pushary] handing the terminal back to local mode\n");
     return "switch";
   }
@@ -1563,7 +1651,7 @@ var extractAssistantText = (message) => {
   }
   return void 0;
 };
-var runDualMode = async (binary, args2, startingMode) => {
+var runDualMode = async (binary, args2, startingMode, runtime = {}) => {
   const compatibilityIssue = remoteCompatibilityIssue(args2);
   if (startingMode === "remote" && compatibilityIssue) {
     process.stderr.write(`[pushary] ${compatibilityIssue}
@@ -1586,7 +1674,7 @@ var runDualMode = async (binary, args2, startingMode) => {
   let noticedUnavailable = false;
   const ensureSdk = async () => {
     if (sdk === void 0) {
-      sdkLoading ??= ensureClaudeSdk((message) => process.stderr.write(`${message}
+      sdkLoading ??= runtime.sdk ? Promise.resolve(runtime.sdk) : ensureClaudeSdk((message) => process.stderr.write(`${message}
 `));
       sdk = await sdkLoading;
       if (!sdk) remoteAvailable = false;
@@ -1599,7 +1687,7 @@ var runDualMode = async (binary, args2, startingMode) => {
   }
   const projectName = basename(process.cwd());
   const agentName = `Claude Code - ${projectName}`;
-  const machineId = getMachineId();
+  const machineId = runtime.machineId ?? getMachineId();
   const stdin = createStdinHandoff();
   const verbose = process.env.PUSHARY_VERBOSE === "1";
   const verboseLog = (message) => {
@@ -1625,8 +1713,7 @@ var runDualMode = async (binary, args2, startingMode) => {
   const input = new BoundedInputQueue({
     cap: INPUT_QUEUE_CAP,
     onDrop: (_dropped, total) => process.stderr.write(`[pushary] input queue full; refused ${total} instruction(s)
-`),
-    coalesce: (items) => userMessage(items.map((m) => m.message.content).join("\n\n"))
+`)
   });
   const approver = createRemoteApprover({
     apiKey,
@@ -1646,6 +1733,7 @@ var runDualMode = async (binary, args2, startingMode) => {
       agentType: "claude_code",
       getSessionId: () => sessionId,
       onCommand: (command) => onPhoneCommand(command),
+      onCommandAvailable: () => poller.wake?.(),
       onFatal: (message) => verboseLog(`[pushary] relay unavailable (${message}); using polling`),
       log: verboseLog
     });
@@ -1673,13 +1761,19 @@ var runDualMode = async (binary, args2, startingMode) => {
         { event, agentType: "claude_code", agentName, action, sessionId, machineId, pid: process.pid },
         { maxAttempts: event === "session_start" ? 4 : 2, timeoutMs: 4e3, requireOk: event === "session_start" }
       );
-    } catch {
+    } catch (error) {
+      if (runtime.onReady && event === "session_start") throw error;
     }
   };
   let presenceHeartbeat;
   let transcriptStarted;
   const ensureTranscriptSync = () => {
-    if (transcriptStarted === sessionId || !transcriptsEnabled() || !sessionId) return;
+    if (!sessionId) return;
+    if (runtime.registerTranscript) {
+      runtime.registerTranscript(sessionId, false);
+      return;
+    }
+    if (transcriptStarted === sessionId || !transcriptsEnabled()) return;
     transcriptStarted = sessionId;
     registerTranscript("claude", { session_id: sessionId, cwd: process.cwd() });
   };
@@ -1691,14 +1785,25 @@ var runDualMode = async (binary, args2, startingMode) => {
     );
     presenceHeartbeat.unref();
   };
-  const setSessionId = (id) => {
+  let readySessionId;
+  const setSessionId = async (id) => {
     const isNew = sessionId !== id;
     sessionId = id;
     sessionCreated = true;
     relay?.reannounce();
-    if (isNew) void announcePresence("session_start", "Remote session ready \u2014 reachable from your phone");
+    if (runtime.onReady && readySessionId !== id) {
+      const control = await pollAgent(apiKey, id, false, AbortSignal.any([AbortSignal.timeout(5e3), ...runtime.signal ? [runtime.signal] : []]), void 0, machineId, "remote");
+      if (!control.mode || control.rejected || control.mode.kill) throw new Error("Phone control could not register or was stopped");
+    }
+    if (isNew || readySessionId !== id) {
+      const registered = announcePresence("session_start", "Remote session ready \u2014 reachable from your phone");
+      if (runtime.onReady) await registered;
+      else void registered;
+    }
     ensurePresenceHeartbeat();
     ensureTranscriptSync();
+    if (readySessionId !== id) await runtime.onReady?.(id);
+    readySessionId = id;
   };
   const onPhoneCommand = async (command) => {
     if (controlMode !== "remote") return false;
@@ -1711,10 +1816,26 @@ var runDualMode = async (binary, args2, startingMode) => {
     }
     if (finished || !input.push(userMessage(command))) return false;
     activeLeg?.onPhoneCommand();
+    void announcePresence("user_prompt", "Working on your message");
     return true;
   };
+  const receipts = new CommandReceipts({
+    wasAccepted: (commandId) => sessionId ? historyAcceptedCommand(claudeTranscriptPath(process.cwd(), sessionId), commandId) : Promise.resolve(false),
+    submit: async (command) => {
+      if (controlMode !== "remote" || finished || !remoteAvailable || !sessionId) return "failed";
+      if (!input.push({ ...userMessage(command.text), uuid: command.id })) return "failed";
+      activeLeg?.onPhoneCommand();
+      void announcePresence("user_prompt", "Working on your message");
+    },
+    log: (message) => process.stderr.write(`${message}
+`)
+  });
   let draft;
   const streamMessage = (message) => {
+    if (message.type === "user" && typeof message.uuid === "string" && !message.parent_tool_use_id) {
+      receipts.accepted(message.uuid);
+      void receipts.flush();
+    }
     draft?.add(message);
     if (message.type === "assistant") {
       const text = extractAssistantText(message);
@@ -1756,13 +1877,15 @@ var runDualMode = async (binary, args2, startingMode) => {
     apiKey,
     getSessionId: () => sessionId,
     onCommand: (command) => onPhoneCommand(command),
-    shouldDrainCommands: () => controlMode === "remote" && Boolean(sessionId) && !(relay?.connected() ?? false),
+    onClaimedCommand: (command, acknowledge) => receipts.receive(command, acknowledge),
+    shouldDrainCommands: () => controlMode === "remote" && Boolean(sessionId),
     // Unified poll: one request per tick for both command + mode/kill (half the
     // requests and the per-poll DB write of the old drain + mode pair).
     poll: async (key, id, wantCommand, signal) => {
+      await receipts.flush();
       const declined = takeoverDecline;
       takeoverDecline = void 0;
-      const result = await pollAgent(key, id, wantCommand, signal, void 0, machineId, controlMode, declined);
+      const result = await pollAgent(key, id, wantCommand, signal, void 0, machineId, controlMode, declined, true);
       if (result.takeoverRequested) void takeOver();
       return result;
     },
@@ -1773,8 +1896,12 @@ var runDualMode = async (binary, args2, startingMode) => {
     // of Redis round trips. Takeover already sits behind a confirm and a biometric.
     slowPollMs: 15e3,
     onAuthRejected: () => {
+      if (runtime.remoteOnly) {
+        finished = true;
+        activeLeg?.stop("kill");
+      }
       process.stderr.write(
-        "[pushary] this key was rejected \u2014 remote stop and phone messages are NOT active; run `pushary login` to reconnect\n"
+        runtime.remoteOnly ? "[pushary] Mac account access was rejected. Sign in to Pushary on this Mac and retry.\n" : "[pushary] this key was rejected \u2014 remote stop and phone messages are NOT active; run `pushary login` to reconnect\n"
       );
     },
     onModeState: (state) => {
@@ -1793,6 +1920,8 @@ var runDualMode = async (binary, args2, startingMode) => {
     activeLeg?.stop("signal");
   };
   for (const signal of signals) process.on(signal, onSignal);
+  runtime.signal?.addEventListener("abort", onSignal, { once: true });
+  if (runtime.signal?.aborted) onSignal();
   const restoreStdin = () => stdin.dispose();
   process.once("exit", restoreStdin);
   const session = {
@@ -1833,6 +1962,7 @@ var runDualMode = async (binary, args2, startingMode) => {
     const exitCode = await driveModeLoop({
       startingMode,
       runLocal: async () => {
+        if (runtime.remoteOnly) return { type: "exit", code: 1 };
         controlMode = "local";
         await draft?.stop();
         draft = void 0;
@@ -1841,6 +1971,7 @@ var runDualMode = async (binary, args2, startingMode) => {
         return runLocalLeg(session);
       },
       runRemote: async () => {
+        if (finished) return { type: "exit", code: 130 };
         controlMode = "remote";
         startRelay();
         const ready = await ensureSdk();
@@ -1861,8 +1992,8 @@ var runDualMode = async (binary, args2, startingMode) => {
           }
           return "switch";
         }
-        draft = startTranscriptDraft(apiKey, () => sessionId);
-        return runRemoteLeg(session, ready);
+        draft = (runtime.startDraft ?? startTranscriptDraft)(apiKey, () => sessionId);
+        return runRemoteLeg(session, ready, { allowLocalHandoff: !runtime.remoteOnly, ...runtime.remoteOnly ? { attended: false } : {} });
       },
       isFinished: () => finished,
       minDwellMs: MIN_MODE_DWELL_MS
@@ -1870,6 +2001,7 @@ var runDualMode = async (binary, args2, startingMode) => {
     return { implemented: true, exitCode };
   } finally {
     for (const signal of signals) process.off(signal, onSignal);
+    runtime.signal?.removeEventListener("abort", onSignal);
     process.removeListener("exit", restoreStdin);
     await draft?.stop();
     relay?.stop();
@@ -1878,7 +2010,10 @@ var runDualMode = async (binary, args2, startingMode) => {
     approver.teardown();
     input.close();
     stdin.dispose();
-    if (sessionId) registerTranscript("claude", { session_id: sessionId, cwd: process.cwd() }, void 0, { ended: true });
+    if (sessionId) {
+      if (runtime.registerTranscript) runtime.registerTranscript(sessionId, true);
+      else registerTranscript("claude", { session_id: sessionId, cwd: process.cwd() }, void 0, { ended: true });
+    }
     await announcePresence("session_closed", "Session ended");
     ownership?.stop();
     if (totalCostUsd > 0) {