@pushary/agent-hooks 0.89.10 → 0.89.12

package/CHANGELOG.md

@@ -1,5 +1,74 @@
 # Changelog
 
+## 0.89.12
+
+### Phone control installs as a native service, without a VM
+
+Fresh setup enables phone-start when a supported provider and the operating
+system's own per-user service manager are available: launchd on macOS, systemd
+on Linux, and Task Scheduler on Windows. Existing installs keep their stored
+choice. Service replacement is transactional, verifies the new process before
+committing, and restores the previous running or stopped state on failure.
+
+Claude Code, Codex and Gemini sessions started from the phone now use the same
+supervised control path. Setup checks both the local heartbeat and the server's
+view of the machine before calling control ready.
+
+### Fresh and partial installs repair themselves
+
+Setup now verifies every global command, its local JavaScript imports, and the
+Cursor and VS Code runtime assets before reusing an installed version. A
+same-version package missing any of them is reinstalled instead of failing the
+same setup forever. Fresh installs also cover Codex on Windows and recover from
+partially configured providers without disturbing unrelated settings.
+
+### The CLI and macOS app keep their own wiring
+
+Cursor setup writes one gate per event even when the other installer ran first.
+`pushary clean` removes the CLI gate while preserving the app's bridge, and
+`pushary doctor` validates the MCP entry from the installer that actually wired
+Cursor. This keeps mixed CLI/app machines working and avoids false repair
+failures on app-only installs.
+
+### Transcript control works in every shell
+
+Setup discloses encrypted transcript sync and its audited compliance-recovery
+path before enabling it for a new install; older installs remain off until setup
+runs again. `pushary setup --transcripts on|off` now provides the same persistent
+choice in POSIX shells, PowerShell and Command Prompt. The existing
+`PUSHARY_TRANSCRIPTS` environment override remains compatible.
+
+## 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

package/README.md

@@ -4,7 +4,7 @@
 [![npm downloads](https://img.shields.io/npm/dm/@pushary/agent-hooks.svg)](https://www.npmjs.com/package/@pushary/agent-hooks)
 [![license](https://img.shields.io/npm/l/@pushary/agent-hooks.svg)](./LICENSE)
 
-Push notifications, questions, and permission approvals for AI coding agents. Get a push when your agent finishes work, answer its questions from your phone, and approve risky commands before they run. Works with Claude Code, Codex, Cursor, VS Code, Gemini CLI, and Hermes.
+Push notifications, questions, and permission approvals for AI agents. Get a push when your agent finishes work, answer its questions from your phone, and approve risky commands before they run. Works with Claude Code, Codex, Cursor, VS Code, OpenCode, Gemini CLI, and Hermes.
 
 Your agent froze waiting for a yes. This is how it reaches you.
 
@@ -110,6 +110,7 @@ npx @pushary/agent-hooks@latest doctor
 | Gemini CLI | yes | yes | yes |
 | Hermes | yes | yes | yes |
 | VS Code | yes | yes | yes |
+| OpenCode | yes | yes | yes |
 
 Any other MCP client can use notify and ask by pointing at the Pushary MCP endpoint directly.
 
@@ -182,7 +183,7 @@ failing closed would let one malformed download silence every hook on the machin
      asserts this list matches it. Do not edit one without the other. -->
 
 ```
-setup        Configure Claude Code, Codex, Gemini CLI, Hermes, Cursor, or VS Code with Pushary
+setup        Configure Claude Code, Codex, Gemini CLI, Hermes, Cursor, VS Code, or OpenCode with Pushary
 claude       Run Claude Code through Pushary, reachable from your phone even when idle
 daemon       Keep this machine reachable so your phone can START a new session
 status       One screen: which key is in force, whether the server accepts it, what can receive an approval

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

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

package/dist/bin/pushary-bell.js

@@ -5,38 +5,38 @@ import {
   liveAgentCount,
   ring,
   upgradeThreshold
-} from "../chunk-TRVIRETT.js";
+} from "../chunk-VPLQFXCH.js";
 import {
   guardBinary
-} from "../chunk-SYUIXXQW.js";
-import "../chunk-X4ZUUFKV.js";
+} from "../chunk-VF3RTVWY.js";
+import "../chunk-L4ZCFMWW.js";
 import {
   claudeSettings
-} from "../chunk-QA72MKIT.js";
+} from "../chunk-OVEGEQSB.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
-import "../chunk-3CUDMTL4.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-LURY4WNF.js";
-import "../chunk-3XTFX4CL.js";
-import "../chunk-BC3VCZ3E.js";
+} from "../chunk-OTPJ4FUR.js";
+import "../chunk-RLQWNEPM.js";
 import "../chunk-DINDL2CF.js";
-import "../chunk-IUWRVTQK.js";
+import "../chunk-RNKPLUWC.js";
+import "../chunk-BC3VCZ3E.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
+import "../chunk-XREW7RQ3.js";
 import {
   readJsonSafe,
   writeJsonAtomic
-} from "../chunk-XX2V4QS5.js";
+} from "../chunk-4LL6LG5X.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-X6RXX2NF.js";
+import "../chunk-3MCEES6Z.js";
 
 // src/bell/install.ts
 import { join } from "path";

package/dist/bin/pushary-claude.js

@@ -1,24 +1,29 @@
 #!/usr/bin/env node
 import {
   ensureDaemonRunning
-} from "../chunk-3SQYKLBW.js";
+} from "../chunk-PS7DQ2SU.js";
 import {
   buildTranscriptRecords,
   decodePublicKey,
-  fetchAccountPublicKey,
   generateSessionKey,
-  uploadTranscriptRecords,
   wrapSessionKey
-} from "../chunk-IUN6VOKV.js";
+} from "../chunk-WDVQ6O4C.js";
+import {
+  fetchTranscriptRecipients,
+  uploadTranscriptRecords
+} from "../chunk-QZCFVWA7.js";
+import {
+  transcriptsEnabled
+} from "../chunk-JJV5Q4KG.js";
 import {
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-TEZ2FZD6.js";
+} from "../chunk-6GU55AQQ.js";
 import {
   needsShell,
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
-import "../chunk-X4ZUUFKV.js";
+import "../chunk-L4ZCFMWW.js";
 import {
   isDeferAnswer
 } from "../chunk-YHG74UFF.js";
@@ -27,7 +32,7 @@ import {
   getPolicy,
   repoKeyFor,
   reportEvent
-} from "../chunk-GTZLL7F4.js";
+} from "../chunk-OADGBOP7.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -39,23 +44,26 @@ import {
   removePendingCommand,
   savePendingCommand,
   waitForAnswer
-} from "../chunk-UXHMWF4H.js";
+} from "../chunk-JHJHCMAF.js";
 import {
+  UNNAMED_ACTION,
   deriveToolTarget,
   describeToolCall,
   scopePathFor
-} from "../chunk-TG3T3M4K.js";
+} from "../chunk-JVZX5YRJ.js";
 import {
   getMachineId
-} from "../chunk-DKWM5T3P.js";
-import "../chunk-QA72MKIT.js";
+} from "../chunk-5NDB3YOE.js";
+import "../chunk-OVEGEQSB.js";
 import "../chunk-DINDL2CF.js";
+import "../chunk-RNKPLUWC.js";
+import "../chunk-BC3VCZ3E.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-IUWRVTQK.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-XX2V4QS5.js";
+import "../chunk-XREW7RQ3.js";
+import "../chunk-4LL6LG5X.js";
 import {
   getApiKey,
   getBaseUrl
@@ -63,7 +71,7 @@ import {
 import {
   KILL_REASON,
   resolveGate
-} from "../chunk-X6RXX2NF.js";
+} from "../chunk-3MCEES6Z.js";
 
 // src/wrapper/claudeBinary.ts
 import { statSync } from "fs";
@@ -142,7 +150,6 @@ import { basename } from "path";
 import { homedir } from "os";
 import { join as join2, resolve } from "path";
 import { existsSync, readFileSync } from "fs";
-var transcriptsEnabled = () => process.env.PUSHARY_TRANSCRIPTS === "1";
 var claudeTranscriptPath = (cwd, sessionId) => {
   const projectId = resolve(cwd).replace(/[^a-zA-Z0-9-]/g, "-");
   const configDir = process.env.CLAUDE_CONFIG_DIR || join2(homedir(), ".claude");
@@ -151,6 +158,8 @@ var claudeTranscriptPath = (cwd, sessionId) => {
 var createSyncState = () => ({
   sessionKey: null,
   wrappedKey: null,
+  providerWrappedKey: null,
+  providerKeyId: null,
   seen: /* @__PURE__ */ new Set(),
   keyUploaded: false,
   keyRejected: false
@@ -159,30 +168,77 @@ var syncTick = async (lines, state, uploader, sessionId, machineId) => {
   if (state.keyRejected) return state;
   let sessionKey = state.sessionKey;
   let wrappedKey = state.wrappedKey;
+  let providerWrappedKey = state.providerWrappedKey;
+  let providerKeyId = state.providerKeyId;
   if (!sessionKey) {
-    const publicKey = await uploader.fetchAccountPublicKey();
-    if (!publicKey) return state;
+    const recipients = await uploader.fetchTranscriptRecipients();
+    if (!recipients) return state;
     sessionKey = generateSessionKey();
-    wrappedKey = wrapSessionKey(sessionKey, decodePublicKey(publicKey));
+    wrappedKey = wrapSessionKey(sessionKey, decodePublicKey(recipients.phonePublicKey));
+    if (recipients.provider) {
+      providerWrappedKey = wrapSessionKey(sessionKey, decodePublicKey(recipients.provider.publicKey));
+      providerKeyId = recipients.provider.keyId;
+    }
   }
   const built = buildTranscriptRecords(lines, sessionKey, state.seen);
   if (built.records.length === 0) {
-    return { ...state, sessionKey, wrappedKey, seen: built.seen };
+    return { ...state, sessionKey, wrappedKey, providerWrappedKey, providerKeyId, seen: built.seen };
+  }
+  const seen = new Set(state.seen);
+  let keyUploaded = state.keyUploaded;
+  let keyRejected = false;
+  let rejected = 0;
+  for (const chunk of chunkRecords(built.records)) {
+    const result = await uploader.uploadRecords({
+      sessionId,
+      machineId,
+      dataEncryptionKey: keyUploaded ? void 0 : wrappedKey ?? void 0,
+      providerWrappedSessionKey: keyUploaded ? void 0 : providerWrappedKey ?? void 0,
+      providerKeyId: keyUploaded ? void 0 : providerKeyId ?? void 0,
+      records: chunk
+    });
+    keyUploaded = keyUploaded || result.keyRegistered;
+    if (result.keyConflict) {
+      keyRejected = true;
+      break;
+    }
+    if (!result.ok) break;
+    for (const id of result.settledIds ?? chunk.map((r) => r.localId)) seen.add(id);
+    rejected += result.rejectedIds.length;
+  }
+  if (rejected > 0) {
+    process.stderr.write(`[pushary] transcript: ${rejected} record${rejected === 1 ? "" : "s"} could not be stored and will not be retried.
+`);
   }
-  const result = await uploader.uploadRecords({
-    sessionId,
-    machineId,
-    dataEncryptionKey: state.keyUploaded ? void 0 : wrappedKey ?? void 0,
-    records: built.records
-  });
   return {
     sessionKey,
     wrappedKey,
-    seen: result.ok ? built.seen : state.seen,
-    keyUploaded: state.keyUploaded || result.keyRegistered,
-    keyRejected: result.keyConflict
+    providerWrappedKey,
+    providerKeyId,
+    seen,
+    keyUploaded,
+    keyRejected
   };
 };
+var MAX_RECORDS_PER_BATCH = 200;
+var MAX_BATCH_BYTES = 3e6;
+var chunkRecords = (records) => {
+  const chunks = [];
+  let current = [];
+  let bytes = 0;
+  for (const record of records) {
+    const size = record.content.length;
+    if (current.length > 0 && (current.length >= MAX_RECORDS_PER_BATCH || bytes + size > MAX_BATCH_BYTES)) {
+      chunks.push(current);
+      current = [];
+      bytes = 0;
+    }
+    current.push(record);
+    bytes += size;
+  }
+  if (current.length > 0) chunks.push(current);
+  return chunks;
+};
 var readLines = (path) => {
   try {
     return existsSync(path) ? readFileSync(path, "utf-8").split("\n") : [];
@@ -190,9 +246,11 @@ var readLines = (path) => {
     return [];
   }
 };
+var IDLE_CEILING_MS = 6e4;
+var nextInterval = (previousMs, idle, baseMs, maxMs) => idle ? Math.min(previousMs * 2, maxMs) : baseMs;
 var startTranscriptSync = (opts) => {
   const uploader = {
-    fetchAccountPublicKey: () => fetchAccountPublicKey(opts.apiKey),
+    fetchTranscriptRecipients: () => fetchTranscriptRecipients(opts.apiKey),
     uploadRecords: (params) => uploadTranscriptRecords(opts.apiKey, params)
   };
   const path = claudeTranscriptPath(opts.cwd, opts.sessionId);
@@ -209,12 +267,26 @@ var startTranscriptSync = (opts) => {
       inFlight = false;
     }
   };
-  const timer = setInterval(() => void tick(), opts.intervalMs ?? 3e3);
-  if (typeof timer.unref === "function") timer.unref();
+  const baseIntervalMs = opts.intervalMs ?? 3e3;
+  const maxIntervalMs = Math.max(baseIntervalMs, IDLE_CEILING_MS);
+  let timer;
+  const schedule = (delayMs) => {
+    if (!running) return;
+    timer = setTimeout(() => {
+      void (async () => {
+        const before = state.sessionKey;
+        await tick();
+        const idle = state.sessionKey === null && before === null;
+        schedule(nextInterval(delayMs, idle, baseIntervalMs, maxIntervalMs));
+      })();
+    }, delayMs);
+    if (typeof timer.unref === "function") timer.unref();
+  };
   void tick();
+  schedule(baseIntervalMs);
   return () => {
     running = false;
-    clearInterval(timer);
+    if (timer) clearTimeout(timer);
   };
 };
 
@@ -342,9 +414,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;
@@ -482,7 +558,7 @@ var createRemoteApprover = (deps) => {
       let question;
       try {
         question = await askUser2(deps.apiKey, {
-          question: `Allow ${description}?`,
+          question: `Allow ${description || UNNAMED_ACTION}?`,
           type: "confirm",
           context: `Your agent wants to run this in ${deps.projectName} (you are away)`,
           agentName: `Claude Code - ${deps.projectName}`,
@@ -1128,7 +1204,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 };
@@ -1482,6 +1563,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({
@@ -1546,6 +1628,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({
@@ -1555,13 +1638,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

@@ -3,13 +3,16 @@ import {
   HERMES_CONFIG_SCRIPT,
   resolveHermesPython,
   runHermesPythonScript
-} from "../chunk-UDBJHQMG.js";
+} from "../chunk-QFJZHVVL.js";
 import {
   removeInstructionBlock,
   shortenHome,
   unregisterPluginLocation,
   vscodeSettingsTargets
-} from "../chunk-MZGWKIUZ.js";
+} from "../chunk-3XSP5SML.js";
+import {
+  pusharyHookExecutable
+} from "../chunk-NESKLV6R.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
@@ -19,25 +22,25 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-34GN3IPX.js";
+} from "../chunk-7DK3ZH3N.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removeGeminiSettings,
   removePusharySettings,
   restoreClaudeMcpServer
-} from "../chunk-Q223OM5J.js";
-import "../chunk-6EKQZA6R.js";
-import "../chunk-SYUIXXQW.js";
+} from "../chunk-6V7ZDH3A.js";
+import "../chunk-KVHP5ZME.js";
+import "../chunk-VF3RTVWY.js";
 import {
   disableDaemonService
-} from "../chunk-3SQYKLBW.js";
+} from "../chunk-PS7DQ2SU.js";
 import "../chunk-XHKBHWLX.js";
 import {
   execNpm
-} from "../chunk-X4ZUUFKV.js";
-import "../chunk-TG3T3M4K.js";
-import "../chunk-DKWM5T3P.js";
+} from "../chunk-L4ZCFMWW.js";
+import "../chunk-JVZX5YRJ.js";
+import "../chunk-5NDB3YOE.js";
 import {
   claudeJson,
   claudeMcpReceipt,
@@ -55,32 +58,33 @@ import {
   geminiMd,
   geminiSettings,
   hermesConfigReceipt,
+  isProtectedByScope,
   pusharyDir,
   removeCodexHookTrust,
   removeCodexHooks,
   vscodePluginDir
-} from "../chunk-QA72MKIT.js";
+} from "../chunk-OVEGEQSB.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-LURY4WNF.js";
-import "../chunk-3XTFX4CL.js";
+} from "../chunk-OTPJ4FUR.js";
+import "../chunk-RLQWNEPM.js";
+import "../chunk-DINDL2CF.js";
 import {
   removeClaudeAlias
 } from "../chunk-BC3VCZ3E.js";
-import "../chunk-DINDL2CF.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-XX2V4QS5.js";
+import "../chunk-4LL6LG5X.js";
 import "../chunk-2UMNXADU.js";
 import {
   CURSOR_GATE_EVENTS,
   HOOK_LOCATOR_BINARY
-} from "../chunk-X6RXX2NF.js";
+} from "../chunk-3MCEES6Z.js";
 
 // bin/pushary-clean.ts
 import { existsSync, readFileSync, copyFileSync, readdirSync } from "fs";
@@ -146,9 +150,9 @@ var VSCODE_PLUGIN_DIR = vscodePluginDir();
 var PUSHARY_DIR = pusharyDir();
 var SHELL_FILES = [".zshrc", ".zprofile", ".bashrc", ".bash_profile"].map((f) => join(homedir(), f));
 var macAppInstalled = () => existsSync(join(PUSHARY_DIR, "bin", HOOK_LOCATOR_BINARY));
-var removalScope = () => ({
+var removalScope = (keepMcpServer) => ({
   keepAppWiring: true,
-  keepMcpServer: macAppInstalled()
+  keepMcpServer
 });
 var readJson = (path) => {
   try {
@@ -189,7 +193,7 @@ var guardedAliasRemoval = () => {
 var writeJson = (path, data) => {
   guardedWrite(path, JSON.stringify(data, null, 2) + "\n");
 };
-var removeCursorUserHook = () => {
+var removeCursorUserHook = (scope) => {
   if (!existsSync(CURSOR_USER_HOOKS)) return "absent";
   let parsed;
   try {
@@ -202,7 +206,10 @@ var removeCursorUserHook = () => {
   let removedAny = false;
   for (const event of CURSOR_GATE_EVENTS) {
     const existing = Array.isArray(hooks[event]) ? hooks[event] : [];
-    const others = existing.filter((h) => !String(h.command ?? "").includes("pushary-gate"));
+    const others = existing.filter((h) => {
+      const command = String(h.command ?? "");
+      return pusharyHookExecutable(command) === null || isProtectedByScope(command, scope);
+    });
     if (others.length === existing.length) continue;
     removedAny = true;
     if (others.length === 0) delete hooks[event];
@@ -221,7 +228,10 @@ var removeCursorUserHook = () => {
     const afterHooks = after?.hooks ?? {};
     const stillThere = CURSOR_GATE_EVENTS.some((event) => {
       const entries = afterHooks[event];
-      return Array.isArray(entries) && entries.some((h) => String(h?.command ?? "").includes("pushary-gate"));
+      return Array.isArray(entries) && entries.some((h) => {
+        const command = String(h?.command ?? "");
+        return pusharyHookExecutable(command) !== null && !isProtectedByScope(command, scope);
+      });
     });
     if (stillThere) return "failed";
   } catch {
@@ -229,13 +239,13 @@ var removeCursorUserHook = () => {
   }
   return "removed";
 };
-var cleanSettingsFile = (path, label) => {
+var cleanSettingsFile = (path, label, scope) => {
   const data = readJson(path);
   if (!data) {
     console.log(`  ${skip} ${label} ${dim("(not found)")}`);
     return;
   }
-  const changed = removePusharySettings(data, removalScope());
+  const changed = removePusharySettings(data, scope);
   if (changed) {
     writeJson(path, data);
     console.log(`  ${check} ${label} ${dim(did("cleaned"))}`);
@@ -280,6 +290,7 @@ var main = async () => {
   }
   console.log();
   const keepShared = macAppInstalled();
+  const scope = removalScope(keepShared);
   if (keepShared) {
     console.log(`  ${dim("The Mac app is installed, so its wiring and the state it owns are left alone.")}`);
     console.log();
@@ -293,8 +304,8 @@ var main = async () => {
     process.exit(EXIT.FAILED);
   }
   console.log(`  ${check} Background service ${dim(did("uninstalled"))}`);
-  cleanSettingsFile(CLAUDE_SETTINGS, "Claude Code settings");
-  cleanSettingsFile(CLAUDE_SETTINGS_LOCAL, "Claude Code settings.local");
+  cleanSettingsFile(CLAUDE_SETTINGS, "Claude Code settings", scope);
+  cleanSettingsFile(CLAUDE_SETTINGS_LOCAL, "Claude Code settings.local", scope);
   const claudeJson2 = keepShared ? null : readJson(CLAUDE_JSON);
   if (keepShared) {
     console.log(`  ${skip} Claude Code MCP servers ${dim("(kept: the Mac app uses it)")}`);
@@ -332,7 +343,7 @@ var main = async () => {
   } else {
     console.log(`  ${skip} Cursor MCP config ${dim("(not found)")}`);
   }
-  const cursorGate = removeCursorUserHook();
+  const cursorGate = removeCursorUserHook(scope);
   if (cursorGate === "removed") {
     console.log(`  ${check} Cursor gate ${dim("(removed from ~/.cursor/hooks.json)")}`);
   } else if (cursorGate === "absent") {
@@ -410,7 +421,7 @@ var main = async () => {
     console.log(`  ${skip} Codex config ${dim("(not found)")}`);
   }
   if (codexHooksData) {
-    if (removeCodexHooks(codexHooksData, removalScope())) {
+    if (removeCodexHooks(codexHooksData, scope)) {
       writeJson(codexHooksJson2, codexHooksData);
       console.log(`  ${check} Codex hooks ${dim("(removed from ~/.codex/hooks.json)")}`);
     } else {
@@ -435,7 +446,7 @@ var main = async () => {
   const geminiSettingsPath = geminiSettings();
   const geminiSettings2 = readJson(geminiSettingsPath);
   if (geminiSettings2) {
-    if (removeGeminiSettings(geminiSettings2, removalScope())) {
+    if (removeGeminiSettings(geminiSettings2, scope)) {
       writeJson(geminiSettingsPath, geminiSettings2);
       console.log(`  ${check} Gemini CLI settings ${dim(did("cleaned"))}`);
     } else {