@pushary/agent-hooks 0.89.11 → 0.89.13

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-VASZ6TWW.js";
+import {
+  pusharyHookExecutable
+} from "../chunk-MSTHT2M7.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
@@ -19,25 +22,25 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-34GN3IPX.js";
+} from "../chunk-ZWEKONU6.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removeGeminiSettings,
   removePusharySettings,
   restoreClaudeMcpServer
-} from "../chunk-Q223OM5J.js";
-import "../chunk-6EKQZA6R.js";
-import "../chunk-SYUIXXQW.js";
+} from "../chunk-JVLB5CAJ.js";
+import "../chunk-B2HND22S.js";
+import "../chunk-VF3RTVWY.js";
 import {
   disableDaemonService
-} from "../chunk-3SQYKLBW.js";
+} from "../chunk-7JZCADBR.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-N4QJ3CLX.js";
+import "../chunk-JTBDBKHU.js";
 import {
   claudeJson,
   claudeMcpReceipt,
@@ -55,32 +58,33 @@ import {
   geminiMd,
   geminiSettings,
   hermesConfigReceipt,
+  isProtectedByScope,
   pusharyDir,
   removeCodexHookTrust,
   removeCodexHooks,
   vscodePluginDir
-} from "../chunk-QA72MKIT.js";
+} from "../chunk-3YGGEDJK.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-LURY4WNF.js";
-import "../chunk-3XTFX4CL.js";
+} from "../chunk-WHDSJ6PD.js";
+import "../chunk-GMJDQDXU.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-QINYXLA5.js";
 
 // bin/pushary-clean.ts
 import { existsSync, readFileSync, copyFileSync, readdirSync } from "fs";
@@ -118,7 +122,16 @@ var APP_OWNED_ENTRIES = [
   // Shared: AgentInstaller.vscodePlugin writes .pushary/plugins/vscode, and so
   // does the CLI. Not attributable, so it is kept whenever the app is installed
   // rather than removed and left registered against a path that is gone.
-  "plugins"
+  "plugins",
+  // Shared, and the one whose loss is silent. `identity.ts` writes this Mac's id
+  // here and `DeviceIdentity.current()` reads it in preference to its own
+  // UserDefaults copy, precisely so one Mac has one id. Deleting it while the app
+  // is installed does not stop the app: it falls back to the copy it minted
+  // before that reconciliation existed, and the Mac starts reporting two ids that
+  // can never compare equal. A session tagged with the other one is then a
+  // session the app refuses to fetch messages for, and one `TerminalJump` calls
+  // `.onAnotherMachine`.
+  "machine-id"
 ];
 var isAppOwned = (name) => APP_OWNED_ENTRIES.includes(name);
 
@@ -146,9 +159,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 +202,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 +215,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 +237,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 +248,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 +299,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 +313,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 +352,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 +430,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 +455,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 {

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

@@ -1,33 +1,40 @@
 #!/usr/bin/env node
-import "../chunk-6XUABEX2.js";
+import "../chunk-3OXHYPZG.js";
 import {
   LiveTranscriptRelay,
   liveSessionSleep,
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-OLAGKKSR.js";
-import "../chunk-IUN6VOKV.js";
+} from "../chunk-ZP3SNUP7.js";
+import "../chunk-4IPSMEGT.js";
+import "../chunk-QZCFVWA7.js";
+import {
+  transcriptsEnabled
+} from "../chunk-M3UABYRT.js";
 import {
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-TEZ2FZD6.js";
+} from "../chunk-CBGGUEKE.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
 import {
   resolveBinary
-} from "../chunk-X4ZUUFKV.js";
+} from "../chunk-L4ZCFMWW.js";
 import {
   getMachineId
-} from "../chunk-DKWM5T3P.js";
-import "../chunk-QA72MKIT.js";
-import "../chunk-XX2V4QS5.js";
+} from "../chunk-JTBDBKHU.js";
+import "../chunk-3YGGEDJK.js";
+import "../chunk-NBDU3R3G.js";
+import "../chunk-BC3VCZ3E.js";
+import "../chunk-ANMHIZZY.js";
+import "../chunk-4LL6LG5X.js";
 import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-X6RXX2NF.js";
+import "../chunk-QINYXLA5.js";
 
 // bin/pushary-codex-bridge.ts
 import { existsSync } from "fs";
@@ -371,13 +378,7 @@ var outcome = await withSpawnProcessOwnership(spawnId, () => runCodexBridge({
     args: ["app-server", "--stdio"]
   },
   signal: abort.signal,
-  // 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 } : {}
+  transcripts: transcriptsEnabled()
 }));
 for (const signal of signals) process.off(signal, stop);
 process.exit(outcome === "stopped" ? 0 : 1);

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

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   defersToNativeMode
-} from "../chunk-NCVIWGVA.js";
+} from "../chunk-S4BLNILH.js";
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "../chunk-3HFK3UXM.js";
+} from "../chunk-FOGW6O2Y.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
@@ -34,7 +34,7 @@ import {
   toCodexWire,
   toPolicyLookup,
   toPolicyLookups
-} from "../chunk-FXIL7RCL.js";
+} from "../chunk-OX35BSPV.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -44,24 +44,25 @@ import {
   sendNotification
 } from "../chunk-JHJHCMAF.js";
 import {
+  UNNAMED_ACTION,
   deriveActionBody,
   deriveBlocker,
   deriveToolTarget,
   describeToolCall,
   scopePathFor
-} from "../chunk-TG3T3M4K.js";
+} from "../chunk-N4QJ3CLX.js";
 import {
   getMachineId
-} from "../chunk-DKWM5T3P.js";
+} from "../chunk-JTBDBKHU.js";
 import {
   canonicalJson
-} from "../chunk-QA72MKIT.js";
+} from "../chunk-3YGGEDJK.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-ANMHIZZY.js";
+import "../chunk-4LL6LG5X.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";
@@ -72,7 +73,7 @@ import {
   hookWaitClamped,
   hookWaitDeadline,
   resolveGate
-} from "../chunk-X6RXX2NF.js";
+} from "../chunk-QINYXLA5.js";
 
 // bin/pushary-codex-hook.ts
 import { basename } from "path";
@@ -179,7 +180,7 @@ var pushQuestion = async (apiKey, input, lookup, waitSeconds, mode) => {
   const projectName = basename(input.cwd ?? process.cwd());
   const description = describeFor(input, lookup);
   const result = await askUser(apiKey, {
-    question: `Allow ${description}?`,
+    question: `Allow ${description || UNNAMED_ACTION}?`,
     type: "confirm",
     context: `Agent wants to run this in ${projectName}`,
     agentName: agentNameFor(input),

package/dist/bin/pushary-codex.js

@@ -1,26 +1,26 @@
 #!/usr/bin/env node
 import {
   reportEvent
-} from "../chunk-FXIL7RCL.js";
+} from "../chunk-OX35BSPV.js";
 import {
   askUser,
   waitForAnswer
 } from "../chunk-JHJHCMAF.js";
-import "../chunk-TG3T3M4K.js";
+import "../chunk-N4QJ3CLX.js";
 import {
   getMachineId
-} from "../chunk-DKWM5T3P.js";
-import "../chunk-QA72MKIT.js";
+} from "../chunk-JTBDBKHU.js";
+import "../chunk-3YGGEDJK.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-ANMHIZZY.js";
+import "../chunk-4LL6LG5X.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";
-import "../chunk-X6RXX2NF.js";
+import "../chunk-QINYXLA5.js";
 
 // bin/pushary-codex.ts
 import { basename } from "path";

package/dist/bin/pushary-connect.js

@@ -1,43 +1,43 @@
 #!/usr/bin/env node
 import {
   printKeyCheck
-} from "../chunk-253WC6O5.js";
+} from "../chunk-YXT55PYF.js";
 import {
   confirmAppConnection,
   connectDevice,
   printConnectInstructions
-} from "../chunk-2LPEZYMC.js";
+} from "../chunk-KNLKHJZR.js";
 import "../chunk-3EGEA4KH.js";
 import {
   checkApiKey
-} from "../chunk-BLODMQKJ.js";
+} from "../chunk-ZO43JTT3.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
-import {
-  readKeySource
-} from "../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-WHDSJ6PD.js";
+import "../chunk-GMJDQDXU.js";
 import "../chunk-DINDL2CF.js";
+import {
+  readKeySource
+} from "../chunk-NBDU3R3G.js";
+import "../chunk-BC3VCZ3E.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-IUWRVTQK.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-XX2V4QS5.js";
+import "../chunk-ANMHIZZY.js";
+import "../chunk-4LL6LG5X.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-X6RXX2NF.js";
+import "../chunk-QINYXLA5.js";
 
 // bin/pushary-connect.ts
 exitOnHelpFlag("connect");

package/dist/bin/pushary-daemon-supervisor.d.ts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/bin/pushary-daemon-supervisor.js

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+
+// bin/pushary-daemon-supervisor.ts
+import { spawn } from "child_process";
+var FIRST_DELAY_MS = 1e4;
+var MAX_DELAY_MS = 5 * 6e4;
+var HEALTHY_RUN_MS = 6e4;
+var daemonEntry = process.argv[2];
+if (!daemonEntry) {
+  process.stderr.write("Missing daemon entry.\n");
+  process.exitCode = 64;
+} else {
+  const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+  const run = () => new Promise((resolve) => {
+    const child = spawn(process.execPath, [daemonEntry], { stdio: "inherit", windowsHide: true });
+    child.once("error", () => resolve(1));
+    child.once("exit", (code) => resolve(code ?? 1));
+  });
+  let delay = FIRST_DELAY_MS;
+  for (; ; ) {
+    const startedAt = Date.now();
+    if (await run() === 0) break;
+    if (Date.now() - startedAt >= HEALTHY_RUN_MS) delay = FIRST_DELAY_MS;
+    await wait(delay);
+    delay = Math.min(delay * 2, MAX_DELAY_MS);
+  }
+}

package/dist/bin/pushary-daemon.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   inspectConfiguredManagedProviders
-} from "../chunk-PZRWFWSR.js";
-import "../chunk-KVE5RCQL.js";
-import "../chunk-FZ73G2RO.js";
+} from "../chunk-MNTZKFZI.js";
+import "../chunk-5YEF55AX.js";
 import {
   HEARTBEAT_INTERVAL_MS,
   sendHeartbeat
-} from "../chunk-TY5HVMXT.js";
-import "../chunk-Q223OM5J.js";
-import "../chunk-6EKQZA6R.js";
-import "../chunk-SYUIXXQW.js";
+} from "../chunk-RAEPAUNJ.js";
+import "../chunk-MSTHT2M7.js";
+import "../chunk-JVLB5CAJ.js";
+import "../chunk-B2HND22S.js";
+import "../chunk-VF3RTVWY.js";
 import {
   DAEMON_LEASE_RENEW_INTERVAL_MS,
   acquireDaemonLease,
@@ -23,45 +23,45 @@ import {
   replaceDaemonService,
   requestDaemonHandoff,
   stopDaemonRunning
-} from "../chunk-3SQYKLBW.js";
+} from "../chunk-7JZCADBR.js";
 import {
   detectProviderLiveCapabilities,
   hasSpawnProvider,
   resolveControlPolicy
-} from "../chunk-6XUABEX2.js";
+} from "../chunk-3OXHYPZG.js";
 import {
   findLiveProcessBySpawnId,
   ownsLiveProcess
-} from "../chunk-TEZ2FZD6.js";
+} from "../chunk-CBGGUEKE.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
 import {
   resolveBinary
-} from "../chunk-X4ZUUFKV.js";
+} from "../chunk-L4ZCFMWW.js";
 import {
   getMachineId
-} from "../chunk-DKWM5T3P.js";
-import "../chunk-QA72MKIT.js";
-import {
-  readControlMode
-} from "../chunk-3CUDMTL4.js";
+} from "../chunk-JTBDBKHU.js";
+import "../chunk-3YGGEDJK.js";
 import {
   exitOnHelpFlag
-} from "../chunk-LURY4WNF.js";
-import "../chunk-3XTFX4CL.js";
-import "../chunk-BC3VCZ3E.js";
+} from "../chunk-WHDSJ6PD.js";
+import "../chunk-GMJDQDXU.js";
 import "../chunk-DINDL2CF.js";
-import "../chunk-IUWRVTQK.js";
+import {
+  readControlMode
+} from "../chunk-NBDU3R3G.js";
+import "../chunk-BC3VCZ3E.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-XX2V4QS5.js";
+import "../chunk-ANMHIZZY.js";
+import "../chunk-4LL6LG5X.js";
 import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-X6RXX2NF.js";
+import "../chunk-QINYXLA5.js";
 
 // src/spawn-daemon.ts
 import { execFileSync, spawn } from "child_process";

package/dist/bin/pushary-disconnect.js

@@ -8,17 +8,17 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-34GN3IPX.js";
+} from "../chunk-ZWEKONU6.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removeGeminiSettings,
   removePusharySettings,
   restoreClaudeMcpServer
-} from "../chunk-Q223OM5J.js";
-import "../chunk-6EKQZA6R.js";
-import "../chunk-SYUIXXQW.js";
-import "../chunk-X4ZUUFKV.js";
+} from "../chunk-JVLB5CAJ.js";
+import "../chunk-B2HND22S.js";
+import "../chunk-VF3RTVWY.js";
+import "../chunk-L4ZCFMWW.js";
 import {
   claudeJson,
   claudeMcpReceipt,
@@ -32,14 +32,14 @@ import {
   geminiSettings,
   removeCodexHooks,
   removeCodexSettings
-} from "../chunk-QA72MKIT.js";
+} from "../chunk-3YGGEDJK.js";
 import {
   exitOnHelpFlag
-} from "../chunk-LURY4WNF.js";
-import "../chunk-3XTFX4CL.js";
+} from "../chunk-WHDSJ6PD.js";
+import "../chunk-GMJDQDXU.js";
 import "../chunk-DINDL2CF.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-X6RXX2NF.js";
+import "../chunk-QINYXLA5.js";
 
 // bin/pushary-disconnect.ts
 import { readdirSync, readFileSync, rmSync, writeFileSync } from "fs";