@pushary/agent-hooks 0.89.9 → 0.89.11

package/CHANGELOG.md

@@ -1,5 +1,59 @@
 # Changelog
 
+## 0.89.11
+
+### Phone-spawned Codex and Gemini sessions record their conversation again
+
+Both bridges relay their turns by default and stop only when told to. The
+launchers told them to stop on every run: the value they passed was an equality
+test against an environment variable nobody sets, which is false whenever it is
+absent and never the "unset" the bridge was looking for. The relay was therefore
+never built, and a session started from the phone had nothing to show but its
+task title. The opt-out is now passed only when it is asked for.
+
+### An agent standing by stops reading as working
+
+`pushary claude` and the Gemini bridge reported that a session had started, that
+it was still alive, and that it had ended, with nothing in between. Their
+heartbeat kept resetting the clock that would otherwise have aged the session out
+of "active", so the phone showed a working agent for one that had been waiting at
+its prompt since its last reply. That is exactly when someone is looking at the
+screen deciding whether to send it something. Both now report the turn boundary
+they already detect, as the Codex bridge always has.
+
+### Taking a session over from your phone says so, and is ready when you ask
+
+An instruction from the phone hands the terminal to Pushary so it can drive an
+agent that would otherwise sit idle. That has not changed. The handover is now
+announced before the session is signalled, instead of the terminal appearing to
+lose its agent for no visible reason. The Agent SDK is resolved when the session
+starts rather than during the handover, so the wait is gone, and a machine that
+cannot reach npm reports the instruction as undelivered instead of accepting it
+and then dropping it. An instruction that is dropped now says it was.
+
+## 0.89.10
+
+### Phone control delivery is crash-safe
+
+Phone instructions now use per-command receipts across polling and relay
+delivery. A process restart acknowledges the recorded outcome instead of
+silently losing or repeating an instruction, multiple queued commands no longer
+overwrite each other, and expired receipts are pruned when new commands arrive.
+
+### Setup and clean reverse only Pushary-owned changes
+
+Setup records the Claude and Hermes configuration it replaces. Clean restores
+that prior shape without deleting later user edits, and retains the receipt when
+service removal, Hermes rollback, or plugin uninstall is incomplete so a retry
+can finish safely. Installations created by older releases keep their compatible
+best-effort cleanup path.
+
+### Native permission modes keep their intended owner
+
+Codex now reads the permission mode it already reports, and Claude
+`PermissionRequest` remains answerable from Pushary after the agent itself asks
+for a human. Kill switches and standing denies still take precedence.
+
 ## 0.89.9
 
 ### Setup proves managed control reaches the server

package/dist/bin/pushary-bell-hook.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   handleBell
-} from "../chunk-FX5QSMPY.js";
+} from "../chunk-TRVIRETT.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
-import "../chunk-V6N4Q223.js";
+import "../chunk-3CUDMTL4.js";
 import "../chunk-BC3VCZ3E.js";
-import "../chunk-OFRNZWC4.js";
+import "../chunk-IUWRVTQK.js";
 import "../chunk-XX2V4QS5.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-L4C2JXJS.js";
+import "../chunk-X6RXX2NF.js";
 
 // bin/pushary-bell-hook.ts
 var main = async () => {

package/dist/bin/pushary-bell.js

@@ -5,18 +5,18 @@ import {
   liveAgentCount,
   ring,
   upgradeThreshold
-} from "../chunk-FX5QSMPY.js";
+} from "../chunk-TRVIRETT.js";
 import {
   guardBinary
-} from "../chunk-AIGDBRIJ.js";
-import "../chunk-PZA7G4CN.js";
+} from "../chunk-SYUIXXQW.js";
+import "../chunk-X4ZUUFKV.js";
 import {
   claudeSettings
-} from "../chunk-GMI5QZLG.js";
+} from "../chunk-QA72MKIT.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
-import "../chunk-V6N4Q223.js";
+import "../chunk-3CUDMTL4.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
@@ -26,7 +26,7 @@ import {
 import "../chunk-3XTFX4CL.js";
 import "../chunk-BC3VCZ3E.js";
 import "../chunk-DINDL2CF.js";
-import "../chunk-OFRNZWC4.js";
+import "../chunk-IUWRVTQK.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
@@ -36,7 +36,7 @@ import {
   writeJsonAtomic
 } from "../chunk-XX2V4QS5.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-L4C2JXJS.js";
+import "../chunk-X6RXX2NF.js";
 
 // src/bell/install.ts
 import { join } from "path";

package/dist/bin/pushary-claude.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   ensureDaemonRunning
-} from "../chunk-543KNJKC.js";
+} from "../chunk-3SQYKLBW.js";
 import {
   buildTranscriptRecords,
   decodePublicKey,
@@ -9,16 +9,16 @@ import {
   generateSessionKey,
   uploadTranscriptRecords,
   wrapSessionKey
-} from "../chunk-PMHTCDEO.js";
+} from "../chunk-IUN6VOKV.js";
 import {
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-TF247BET.js";
+} from "../chunk-TEZ2FZD6.js";
 import {
   needsShell,
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
-import "../chunk-PZA7G4CN.js";
+import "../chunk-X4ZUUFKV.js";
 import {
   isDeferAnswer
 } from "../chunk-YHG74UFF.js";
@@ -27,7 +27,7 @@ import {
   getPolicy,
   repoKeyFor,
   reportEvent
-} from "../chunk-4XZCDSNG.js";
+} from "../chunk-FXIL7RCL.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -35,23 +35,24 @@ import {
   markPendingCommandDelivered,
   markPendingCommandFailed,
   readPendingCommand,
+  readPendingCommandById,
   removePendingCommand,
   savePendingCommand,
   waitForAnswer
-} from "../chunk-GKAKAOKC.js";
+} from "../chunk-JHJHCMAF.js";
 import {
   deriveToolTarget,
   describeToolCall,
   scopePathFor
-} from "../chunk-KOPUTJQC.js";
+} from "../chunk-TG3T3M4K.js";
 import {
   getMachineId
-} from "../chunk-DKDDLF5P.js";
-import "../chunk-GMI5QZLG.js";
+} from "../chunk-DKWM5T3P.js";
+import "../chunk-QA72MKIT.js";
 import "../chunk-DINDL2CF.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-OFRNZWC4.js";
+import "../chunk-IUWRVTQK.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-XX2V4QS5.js";
@@ -62,7 +63,7 @@ import {
 import {
   KILL_REASON,
   resolveGate
-} from "../chunk-L4C2JXJS.js";
+} from "../chunk-X6RXX2NF.js";
 
 // src/wrapper/claudeBinary.ts
 import { statSync } from "fs";
@@ -341,9 +342,13 @@ var BoundedInputQueue = class {
   }
   // Drop every buffered item without closing the queue. Used when phone control
   // turns out to be unavailable (offline SDK setup) so a pending instruction does
-  // not make the local leg switch again into a mode that cannot run.
+  // not make the local leg switch again into a mode that cannot run. Returns how
+  // many were dropped, because these are somebody's words and the caller has to
+  // be able to say they are gone.
   clear() {
+    const dropped = this.buffer.length;
     this.buffer.length = 0;
+    return dropped;
   }
   get isClosed() {
     return this.closed;
@@ -664,20 +669,8 @@ var pollAgent = async (apiKey, sessionId, wantCommand, signal, baseUrl = getBase
   try {
     const sessionKey = sessionId || DEFAULT_SESSION;
     const receiptNamespace = `${apiKey}:${machineId}:claude_code`;
-    const storedCommand = wantCommand && machineId ? readPendingCommand(sessionKey, receiptNamespace) : null;
-    const response = await fetch(`${baseUrl}/api/agent/poll`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json", Authorization: `Bearer ${apiKey}` },
-      body: JSON.stringify({
-        ...sessionId ? { sessionId } : {},
-        ...machineId ? { machineId } : {},
-        ...wantCommand && !storedCommand ? {} : { drain: false },
-        ...wantCommand && !storedCommand && machineId ? { ackMode: true } : {}
-      }),
-      signal
-    });
-    if (!response.ok) return { command: null, mode: null };
-    const data = await response.json();
+    let storedCommand = machineId ? readPendingCommand(sessionKey, receiptNamespace) : null;
+    let acknowledgedCommandId = null;
     const acknowledge = async (id, state) => {
       const persisted = state === "delivered" ? markPendingCommandDelivered(sessionKey, id, receiptNamespace) : markPendingCommandFailed(sessionKey, id, receiptNamespace);
       if (!persisted) return false;
@@ -700,6 +693,29 @@ var pollAgent = async (apiKey, sessionId, wantCommand, signal, baseUrl = getBase
         return false;
       }
     };
+    if (storedCommand?.delivered || storedCommand?.failed) {
+      const acknowledged = await acknowledge(
+        storedCommand.id,
+        storedCommand.failed ? "failed" : "delivered"
+      );
+      if (acknowledged) {
+        acknowledgedCommandId = storedCommand.id;
+        storedCommand = null;
+      }
+    }
+    const response = await fetch(`${baseUrl}/api/agent/poll`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json", Authorization: `Bearer ${apiKey}` },
+      body: JSON.stringify({
+        ...sessionId ? { sessionId } : {},
+        ...machineId ? { machineId } : {},
+        ...wantCommand && !storedCommand ? {} : { drain: false },
+        ...wantCommand && !storedCommand && machineId ? { ackMode: true } : {}
+      }),
+      signal
+    });
+    if (!response.ok) return { command: null, mode: null };
+    const data = await response.json();
     const claimedCommand = (id, text) => ({
       id,
       text,
@@ -707,15 +723,10 @@ var pollAgent = async (apiKey, sessionId, wantCommand, signal, baseUrl = getBase
     });
     let command = typeof data.command === "string" && data.command.length > 0 ? data.command : null;
     if (storedCommand) {
-      if (storedCommand.delivered || storedCommand.failed) {
-        await acknowledge(storedCommand.id, storedCommand.failed ? "failed" : "delivered");
-        command = null;
-      } else {
-        command = claimedCommand(storedCommand.id, storedCommand.text);
-      }
+      command = storedCommand.delivered || storedCommand.failed ? null : claimedCommand(storedCommand.id, storedCommand.text);
     } else if (data.command && typeof data.command === "object") {
       const claimed = data.command;
-      if (typeof claimed.id === "string" && typeof claimed.text === "string") {
+      if (typeof claimed.id === "string" && typeof claimed.text === "string" && claimed.id !== acknowledgedCommandId) {
         const saved = savePendingCommand(sessionKey, {
           id: claimed.id,
           text: claimed.text,
@@ -780,6 +791,7 @@ var decodeServerFrame = (raw) => {
 var DEFAULT_HEARTBEAT_MS = 2e4;
 var DEFAULT_PONG_TIMEOUT_MS = 1e4;
 var DEFAULT_MAX_SEEN_COMMANDS = 256;
+var COMMAND_RECEIPT_TTL_MS = 36e5;
 var defaultBackoff = (attempt) => Math.min(1e3 * 2 ** attempt, 3e4);
 var defaultSocketFactory = (url) => {
   const WS = globalThis.WebSocket;
@@ -810,6 +822,17 @@ var createRelayClient = (options) => {
   const seenCommands = [];
   const seenSet = /* @__PURE__ */ new Set();
   const log = (message) => options.log?.(message);
+  const receiptNamespace = `${options.apiKey}:${options.machineId}:${options.agentType}`;
+  const acknowledgeStored = (id) => {
+    const receipt = readPendingCommandById(
+      options.getSessionId() || DEFAULT_SESSION,
+      id,
+      receiptNamespace
+    );
+    if (!receipt || !receipt.delivered && !receipt.failed) return false;
+    sendFrame(receipt.failed ? { v: PROTOCOL_VERSION, t: "ack", id, state: "failed", failureCode: "consumer_rejected" } : { v: PROTOCOL_VERSION, t: "ack", id, state: "delivered" });
+    return true;
+  };
   const clearTimers = () => {
     if (heartbeatTimer) clearInterval(heartbeatTimer);
     if (pongTimer) clearTimeout(pongTimer);
@@ -870,12 +893,24 @@ var createRelayClient = (options) => {
           sendFrame({ v: PROTOCOL_VERSION, t: "ack", id: frame.id, state: "delivered" });
           break;
         }
+        if (acknowledgeStored(frame.id)) break;
+        const sessionKey = options.getSessionId() || DEFAULT_SESSION;
+        if (!savePendingCommand(sessionKey, {
+          id: frame.id,
+          text: frame.text,
+          expiresAtMs: Date.now() + COMMAND_RECEIPT_TTL_MS,
+          delivered: false,
+          failed: true
+        }, receiptNamespace)) {
+          acknowledgeStored(frame.id);
+          break;
+        }
         let accepted = false;
         try {
           accepted = options.onCommand(frame.text) !== false;
         } catch {
         }
-        if (accepted) {
+        if (accepted && markPendingCommandDelivered(sessionKey, frame.id, receiptNamespace)) {
           rememberCommand(frame.id);
           sendFrame({ v: PROTOCOL_VERSION, t: "ack", id: frame.id, state: "delivered" });
         } else {
@@ -1097,7 +1132,12 @@ var runLocalLeg = (session, deps = {}) => {
     const control = {
       onPhoneCommand: () => {
         if (!exitReason) exitReason = "switch";
-        if (!legAbort.signal.aborted) legAbort.abort();
+        if (!legAbort.signal.aborted) {
+          process.stderr.write(
+            "\n[pushary] instruction from your phone \u2014 taking this session over to run it (Ctrl-] hands the terminal back)\n"
+          );
+          legAbort.abort();
+        }
       },
       stop: (reason) => {
         if (!exitReason) exitReason = { type: "exit", code: reason === "signal" ? 130 : 0 };
@@ -1451,6 +1491,7 @@ var runDualMode = async (binary, args2, startingMode) => {
     } else if (message.type === "result") {
       if (typeof message.total_cost_usd === "number") totalCostUsd = message.total_cost_usd;
       process.stderr.write("[pushary] turn complete \u2014 standing by for phone commands\n");
+      void announcePresence("stop", "Turn complete");
     }
   };
   const poller = startCommandPoller({
@@ -1515,6 +1556,7 @@ var runDualMode = async (binary, args2, startingMode) => {
       void announcePresence("session_start", "Session ready \u2014 reachable from your phone");
       ensurePresenceHeartbeat();
       ensureTranscriptSync();
+      void ensureSdk();
     }
     if (startingMode === "remote" && initialPrompt) input.push(userMessage(initialPrompt));
     const exitCode = await driveModeLoop({
@@ -1524,13 +1566,19 @@ var runDualMode = async (binary, args2, startingMode) => {
         const ready = await ensureSdk();
         if (!ready) {
           remoteAvailable = false;
-          input.clear();
+          const dropped = input.clear();
           if (!noticedUnavailable) {
             noticedUnavailable = true;
             process.stderr.write(
               "[pushary] could not start phone control (offline?); staying in the terminal. Relaunch when online to enable.\n"
             );
           }
+          if (dropped > 0) {
+            process.stderr.write(
+              `[pushary] ${dropped} instruction(s) from your phone could not be delivered and were dropped.
+`
+            );
+          }
           return "switch";
         }
         return runRemoteLeg(session, ready);

package/dist/bin/pushary-clean.js

@@ -1,10 +1,15 @@
 #!/usr/bin/env node
+import {
+  HERMES_CONFIG_SCRIPT,
+  resolveHermesPython,
+  runHermesPythonScript
+} from "../chunk-UDBJHQMG.js";
 import {
   removeInstructionBlock,
   shortenHome,
   unregisterPluginLocation,
   vscodeSettingsTargets
-} from "../chunk-A4O5ROZK.js";
+} from "../chunk-MZGWKIUZ.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
@@ -14,25 +19,28 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-O5B7EK5U.js";
+} from "../chunk-34GN3IPX.js";
 import {
+  isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removeGeminiSettings,
-  removePusharySettings
-} from "../chunk-VA7VUNRD.js";
-import "../chunk-ATBKJNWS.js";
-import "../chunk-AIGDBRIJ.js";
+  removePusharySettings,
+  restoreClaudeMcpServer
+} from "../chunk-Q223OM5J.js";
+import "../chunk-6EKQZA6R.js";
+import "../chunk-SYUIXXQW.js";
 import {
   disableDaemonService
-} from "../chunk-543KNJKC.js";
+} from "../chunk-3SQYKLBW.js";
 import "../chunk-XHKBHWLX.js";
 import {
   execNpm
-} from "../chunk-PZA7G4CN.js";
-import "../chunk-KOPUTJQC.js";
-import "../chunk-DKDDLF5P.js";
+} from "../chunk-X4ZUUFKV.js";
+import "../chunk-TG3T3M4K.js";
+import "../chunk-DKWM5T3P.js";
 import {
   claudeJson,
+  claudeMcpReceipt,
   claudeSettings,
   claudeSettingsLocal,
   claudeSkillDir,
@@ -46,11 +54,12 @@ import {
   cursorUserMcp,
   geminiMd,
   geminiSettings,
+  hermesConfigReceipt,
   pusharyDir,
   removeCodexHookTrust,
   removeCodexHooks,
   vscodePluginDir
-} from "../chunk-GMI5QZLG.js";
+} from "../chunk-QA72MKIT.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
@@ -71,13 +80,12 @@ import "../chunk-2UMNXADU.js";
 import {
   CURSOR_GATE_EVENTS,
   HOOK_LOCATOR_BINARY
-} from "../chunk-L4C2JXJS.js";
+} from "../chunk-X6RXX2NF.js";
 
 // bin/pushary-clean.ts
 import { existsSync, readFileSync, copyFileSync, readdirSync } from "fs";
 import { join } from "path";
 import { homedir, tmpdir } from "os";
-import { execSync as execSync2 } from "child_process";
 import { confirm } from "@inquirer/prompts";
 import { parse as parseTOML, stringify as stringifyTOML } from "smol-toml";
 
@@ -128,6 +136,8 @@ var incompleteClean = false;
 var CLAUDE_SETTINGS = claudeSettings();
 var CLAUDE_SETTINGS_LOCAL = claudeSettingsLocal();
 var CLAUDE_JSON = claudeJson();
+var CLAUDE_MCP_RECEIPT = claudeMcpReceipt();
+var HERMES_CONFIG_RECEIPT = hermesConfigReceipt();
 var SKILL_DIR = claudeSkillDir();
 var CURSOR_MCP = cursorUserMcp();
 var CURSOR_PLUGIN_DIR = cursorPluginDir();
@@ -140,22 +150,6 @@ var removalScope = () => ({
   keepAppWiring: true,
   keepMcpServer: macAppInstalled()
 });
-var resolveHermesPython = () => {
-  try {
-    const launcher = execSync2("command -v hermes", { encoding: "utf-8", stdio: "pipe", timeout: 5e3 }).trim();
-    if (launcher) {
-      const shebang = readFileSync(launcher, "utf-8").split("\n", 1)[0];
-      if (shebang.startsWith("#!")) {
-        const interpreter = shebang.slice(2).trim().split(/\s+/)[0];
-        if (interpreter && /python/i.test(interpreter) && existsSync(interpreter)) return interpreter;
-      }
-    }
-  } catch {
-  }
-  const venvPython = join(homedir(), ".hermes", "hermes-agent", "venv", "bin", "python3");
-  if (existsSync(venvPython)) return venvPython;
-  return null;
-};
 var readJson = (path) => {
   try {
     return JSON.parse(readFileSync(path, "utf-8"));
@@ -305,12 +299,21 @@ var main = async () => {
   if (keepShared) {
     console.log(`  ${skip} Claude Code MCP servers ${dim("(kept: the Mac app uses it)")}`);
   } else if (claudeJson2) {
-    if (removeClaudeMcpServers(claudeJson2)) {
+    const rawReceipt = readJson(CLAUDE_MCP_RECEIPT);
+    const receipt = isClaudeMcpSnapshot(rawReceipt) ? rawReceipt : null;
+    if (existsSync(CLAUDE_MCP_RECEIPT) && !receipt) {
+      incompleteClean = true;
+      console.log(`  ${skip} Claude Code MCP servers ${dim("(setup receipt is unreadable; left unchanged)")}`);
+    } else if (receipt && restoreClaudeMcpServer(claudeJson2, receipt) || !receipt && removeClaudeMcpServers(claudeJson2)) {
       writeJson(CLAUDE_JSON, claudeJson2);
-      console.log(`  ${check} Claude Code MCP servers ${dim("(removed from ~/.claude.json)")}`);
+      console.log(`  ${check} Claude Code MCP servers ${dim(receipt ? "(previous entry restored)" : "(removed from ~/.claude.json)")}`);
     } else {
-      console.log(`  ${skip} Claude Code MCP servers ${dim("(no pushary entries)")}`);
+      if (receipt) incompleteClean = true;
+      console.log(`  ${skip} Claude Code MCP servers ${dim(receipt ? "(changed after setup; left unchanged)" : "(no pushary entries)")}`);
     }
+  } else if (existsSync(CLAUDE_MCP_RECEIPT)) {
+    incompleteClean = true;
+    console.log(`  ${skip} Claude Code MCP servers ${dim("(config missing; setup receipt kept for retry)")}`);
   } else {
     console.log(`  ${skip} Claude Code MCP servers ${dim("(not found)")}`);
   }
@@ -487,19 +490,23 @@ var main = async () => {
   }
   const hermesPython = resolveHermesPython();
   if (hermesPython) {
-    const snippet = 'from hermes_cli.config import load_config, save_config; c = load_config(); p = c.get("plugins") if isinstance(c.get("plugins"), dict) else {}; e = p.get("enabled") if isinstance(p.get("enabled"), list) else []; p["enabled"] = [x for x in e if x != "pushary"]; c["plugins"] = p; a = c.get("agent") if isinstance(c.get("agent"), dict) else {}; d = a.get("disabled_toolsets") if isinstance(a.get("disabled_toolsets"), list) else []; a["disabled_toolsets"] = [x for x in d if x != "clarify"]; c["agent"] = a; save_config(c)';
-    try {
-      guardedExec(`"${hermesPython}" -c '${snippet}'`, { stdio: "pipe", timeout: 15e3 }, "hermes plugin config update");
-      console.log(`  ${check} Hermes config ${dim("(plugin disabled, clarify toolset restored)")}`);
-    } catch {
+    const configUpdated = dryRun ? (wouldNote("run    ", "hermes plugin config restore"), true) : runHermesPythonScript(hermesPython, HERMES_CONFIG_SCRIPT, "clean", HERMES_CONFIG_RECEIPT);
+    if (!configUpdated) {
+      incompleteClean = true;
       console.log(`  ${skip} Hermes config ${dim("(could not update config.yaml)")}`);
+    } else {
+      console.log(`  ${check} Hermes config ${dim("(setup-owned changes restored)")}`);
+      try {
+        guardedExec(`"${hermesPython}" -m pip uninstall -y hermes-plugin-pushary`, { stdio: "pipe", timeout: 6e4 }, "pip uninstall hermes-plugin-pushary");
+        console.log(`  ${check} Hermes plugin ${dim("(pip uninstalled)")}`);
+      } catch {
+        incompleteClean = true;
+        console.log(`  ${skip} Hermes plugin ${dim("(could not uninstall; setup receipt kept for retry)")}`);
+      }
     }
-    try {
-      guardedExec(`"${hermesPython}" -m pip uninstall -y hermes-plugin-pushary`, { stdio: "pipe", timeout: 6e4 }, "pip uninstall hermes-plugin-pushary");
-      console.log(`  ${check} Hermes plugin ${dim("(pip uninstalled)")}`);
-    } catch {
-      console.log(`  ${skip} Hermes plugin ${dim("(not installed)")}`);
-    }
+  } else if (existsSync(HERMES_CONFIG_RECEIPT)) {
+    incompleteClean = true;
+    console.log(`  ${skip} Hermes ${dim("(runtime not found; setup receipt kept for retry)")}`);
   } else {
     console.log(`  ${skip} Hermes ${dim("(not found)")}`);
   }
@@ -534,7 +541,7 @@ var main = async () => {
     let removed = 0;
     const kept = [];
     for (const entry of readdirSync(PUSHARY_DIR)) {
-      if (keepShared && isAppOwned(entry)) {
+      if (keepShared && isAppOwned(entry) || entry === "setup" && (keepShared || incompleteClean)) {
         kept.push(entry);
         continue;
       }
@@ -548,7 +555,7 @@ var main = async () => {
       console.log(`  ${skip} Local state ${dim("(nothing of ours in ~/.pushary)")}`);
     }
     if (kept.length > 0) {
-      console.log(`    ${dim(`left ${kept.sort().join(", ")} for the Mac app`)}`);
+      console.log(`    ${dim(`left ${kept.sort().join(", ")} for ${keepShared ? "the Mac app" : "a cleanup retry"}`)}`);
     }
   } else {
     console.log(`  ${skip} Local state ${dim("(~/.pushary not found)")}`);

package/dist/bin/pushary-codex-bridge.js

@@ -1,33 +1,33 @@
 #!/usr/bin/env node
-import "../chunk-NKHEHEUM.js";
+import "../chunk-6XUABEX2.js";
 import {
   LiveTranscriptRelay,
   liveSessionSleep,
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-C623LWJR.js";
-import "../chunk-PMHTCDEO.js";
+} from "../chunk-OLAGKKSR.js";
+import "../chunk-IUN6VOKV.js";
 import {
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-TF247BET.js";
+} from "../chunk-TEZ2FZD6.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
 import {
   resolveBinary
-} from "../chunk-PZA7G4CN.js";
+} from "../chunk-X4ZUUFKV.js";
 import {
   getMachineId
-} from "../chunk-DKDDLF5P.js";
-import "../chunk-GMI5QZLG.js";
+} from "../chunk-DKWM5T3P.js";
+import "../chunk-QA72MKIT.js";
 import "../chunk-XX2V4QS5.js";
 import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-L4C2JXJS.js";
+import "../chunk-X6RXX2NF.js";
 
 // bin/pushary-codex-bridge.ts
 import { existsSync } from "fs";
@@ -371,7 +371,13 @@ var outcome = await withSpawnProcessOwnership(spawnId, () => runCodexBridge({
     args: ["app-server", "--stdio"]
   },
   signal: abort.signal,
-  transcripts: process.env.PUSHARY_TRANSCRIPTS === "1"
+  // The bridge's own default is ON (`transcripts?: boolean`, and it opts out only
+  // on an explicit `false`), but `=== '1'` can never produce `undefined`, so an
+  // unset env var forced the opt-out on every spawn and the live relay was never
+  // built. Pass the opt-out only when the user asks for one. The relay stays a
+  // hard no-op until this account's phone has registered a public key, and what
+  // it sends is encrypted to that key on this machine.
+  ...process.env.PUSHARY_TRANSCRIPTS === "0" ? { transcripts: false } : {}
 }));
 for (const signal of signals) process.off(signal, stop);
 process.exit(outcome === "stopped" ? 0 : 1);