@pushary/agent-hooks 0.89.2 → 0.89.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.89.3
+
+### Doctor recognizes hooks installed by the macOS app
+
+Claude Code, Codex and Gemini hooks that point at the shared native
+`pushary-bridge` now pass the same presence, executable and timeout checks as
+their npm hook binaries. Doctor no longer tells a Mac-managed install to repair
+hooks that are already installed and running.
+
 ## 0.89.2
 
 ### Multi-question prompts keep their real answer shape

package/dist/bin/pushary-claude.js

@@ -29,12 +29,17 @@ import {
   getPolicy,
   repoKeyFor,
   reportEvent
-} from "../chunk-6XSC6Z2K.js";
+} from "../chunk-3UBYTSCY.js";
 import {
+  DEFAULT_SESSION,
   askUser,
   cancelQuestion,
+  markPendingCommandDelivered,
+  readPendingCommand,
+  removePendingCommand,
+  savePendingCommand,
   waitForAnswer
-} from "../chunk-J3YDT4HM.js";
+} from "../chunk-HUJAAWNL.js";
 import {
   deriveToolTarget,
   describeToolCall,
@@ -644,20 +649,58 @@ 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()) => {
+var pollAgent = async (apiKey, sessionId, wantCommand, signal, baseUrl = getBaseUrl(), machineId) => {
   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 } : {},
-        ...wantCommand ? {} : { drain: false }
+        ...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 command = typeof data.command === "string" && data.command.length > 0 ? data.command : null;
+    const acknowledge = async (id) => {
+      try {
+        const acknowledged = await fetch(`${baseUrl}/api/agent/command/ack`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json", Authorization: `Bearer ${apiKey}` },
+          body: JSON.stringify({ commandId: id, sessionId: sessionId ?? null, machineId, state: "delivered" }),
+          signal
+        });
+        return acknowledged.ok;
+      } catch {
+        return false;
+      }
+    };
+    let command = typeof data.command === "string" && data.command.length > 0 ? data.command : null;
+    if (storedCommand) {
+      const acknowledged = await acknowledge(storedCommand.id);
+      if (acknowledged && storedCommand.delivered) removePendingCommand(sessionKey, storedCommand.id, receiptNamespace);
+      if (acknowledged && !storedCommand.delivered && markPendingCommandDelivered(sessionKey, storedCommand.id, receiptNamespace)) {
+        command = storedCommand.text;
+      } else {
+        command = null;
+      }
+    } else if (data.command && typeof data.command === "object") {
+      const claimed = data.command;
+      if (typeof claimed.id === "string" && typeof claimed.text === "string") {
+        const saved = savePendingCommand(sessionKey, {
+          id: claimed.id,
+          text: claimed.text,
+          expiresAtMs: typeof claimed.expiresAtMs === "number" ? claimed.expiresAtMs : Date.now() + 36e5,
+          delivered: false
+        }, receiptNamespace);
+        command = saved && await acknowledge(claimed.id) && markPendingCommandDelivered(sessionKey, claimed.id, receiptNamespace) ? claimed.text : null;
+      }
+    }
     const m = data.override?.mode;
     const mode = {
       mode: typeof m === "string" && APPROVAL_MODES.has(m) ? m : null,
@@ -799,12 +842,15 @@ var createRelayClient = (options) => {
         log("[pushary] relay connected");
         break;
       case "command":
-        sendFrame({ v: PROTOCOL_VERSION, t: "ack", id: frame.id });
-        if (rememberCommand(frame.id)) {
-          try {
-            options.onCommand(frame.text);
-          } catch {
-          }
+        if (seenSet.has(frame.id)) {
+          sendFrame({ v: PROTOCOL_VERSION, t: "ack", id: frame.id });
+          break;
+        }
+        try {
+          options.onCommand(frame.text);
+          rememberCommand(frame.id);
+          sendFrame({ v: PROTOCOL_VERSION, t: "ack", id: frame.id });
+        } catch {
         }
         break;
       case "ping":
@@ -1378,7 +1424,7 @@ var runDualMode = async (binary, args2, startingMode) => {
     shouldDrainCommands: () => !(relay?.connected() ?? false),
     // 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: pollAgent,
+    poll: (key, id, wantCommand, signal) => pollAgent(key, id, wantCommand, signal, void 0, machineId),
     fetchModeState,
     // Relay-primary: idle the safety-net poll at 60s (see RELAY_FALLBACK_POLL_MS).
     // No relay advertised -> the poller IS the command path, so keep the default.

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

@@ -276,7 +276,11 @@ var runCodexBridge = async (options) => {
           await liveSessionSleep(options.pollIntervalMs ?? 2e3, options.signal);
           continue;
         }
-        const response = await postLiveSession(options, "/api/agent/command/drain", { sessionId: threadId, ackMode: true });
+        const response = await postLiveSession(options, "/api/agent/command/drain", {
+          sessionId: threadId,
+          machineId: options.machineId,
+          ackMode: true
+        });
         if (response.ok) {
           const command = object((await response.json()).command);
           const commandId = string(command?.id);
@@ -284,10 +288,17 @@ var runCodexBridge = async (options) => {
           if (commandId && text) {
             try {
               await startTurn(text, commandId);
-              pendingAck = { commandId, state: "delivered" };
+              pendingAck = {
+                commandId,
+                sessionId: threadId,
+                machineId: options.machineId,
+                state: "delivered"
+              };
             } catch {
               pendingAck = {
                 commandId,
+                sessionId: threadId,
+                machineId: options.machineId,
                 state: "failed",
                 failureCode: "codex_rejected"
               };

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

@@ -34,7 +34,7 @@ import {
   toCodexWire,
   toPolicyLookup,
   toPolicyLookups
-} from "../chunk-6XSC6Z2K.js";
+} from "../chunk-3UBYTSCY.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -42,7 +42,7 @@ import {
   pollForAnswer,
   savePendingQuestion,
   sendNotification
-} from "../chunk-J3YDT4HM.js";
+} from "../chunk-HUJAAWNL.js";
 import {
   deriveActionBody,
   deriveBlocker,

package/dist/bin/pushary-codex.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   reportEvent
-} from "../chunk-6XSC6Z2K.js";
+} from "../chunk-3UBYTSCY.js";
 import {
   askUser,
   waitForAnswer
-} from "../chunk-J3YDT4HM.js";
+} from "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import {
   getMachineId

package/dist/bin/pushary-doctor.js

@@ -5,8 +5,9 @@ import {
 import {
   claudeWired,
   codexWired,
-  geminiWired
-} from "../chunk-4VYUMYWD.js";
+  geminiWired,
+  pusharyHookExecutable
+} from "../chunk-3O2XPYLF.js";
 import {
   readDaemonStatus
 } from "../chunk-K42SZKYF.js";
@@ -111,14 +112,15 @@ import {
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
 import {
-  CURSOR_GATE_EVENTS
+  CURSOR_GATE_EVENTS,
+  HOOK_LOCATOR_BINARY
 } from "../chunk-L4C2JXJS.js";
 
 // bin/pushary-doctor.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { join } from "path";
 import { homedir as homedir2 } from "os";
-import { execSync } from "child_process";
+import { execFileSync } from "child_process";
 import { confirm } from "@inquirer/prompts";
 import { parse as parseTOML } from "smol-toml";
 
@@ -219,10 +221,11 @@ var readJson = (path) => {
   }
 };
 var commandResolves = (command) => {
-  if (command.includes("/") || command.includes("\\")) return existsSync(command);
+  const target = pusharyHookExecutable(command) ?? command;
+  if (target.includes("/") || target.includes("\\")) return existsSync(target);
   try {
     const whichCmd = process.platform === "win32" ? "where" : "which";
-    execSync(`${whichCmd} ${command}`, { stdio: "ignore", timeout: 5e3 });
+    execFileSync(whichCmd, [target], { stdio: "ignore", timeout: 5e3 });
     return true;
   } catch {
     return false;
@@ -240,6 +243,7 @@ var extractHookCommand = (entries, needle) => {
   }
   return null;
 };
+var extractAgentHookCommand = (entries, needle) => extractHookCommand(entries, needle) ?? extractHookCommand(entries, HOOK_LOCATOR_BINARY);
 var extractHookTimeout = (entries, needle) => {
   if (!Array.isArray(entries)) return null;
   for (const entry of entries) {
@@ -395,10 +399,11 @@ var main = async () => {
       { event: "PermissionDenied", needle: "pushary-permission-denied-hook", label: "PermissionDenied hook" }
     ];
     for (const { event, needle, label } of CLAUDE_HOOK_CHECKS) {
-      const present = JSON.stringify(hooks?.[event] ?? []).includes(needle);
+      const configured = JSON.stringify(hooks?.[event] ?? []);
+      const present = configured.includes(needle) || configured.includes(HOOK_LOCATOR_BINARY);
       check(present, `Claude Code: ${label}`, present ? void 0 : "missing \u2014 run npx @pushary/agent-hooks@latest upgrade");
     }
-    const preHookCommand = extractHookCommand(hooks?.PreToolUse, "pushary-hook");
+    const preHookCommand = extractAgentHookCommand(hooks?.PreToolUse, "pushary-hook");
     if (preHookCommand) {
       const resolves = commandResolves(preHookCommand);
       check(resolves, "Claude Code: hook command resolves", resolves ? preHookCommand : `not on PATH \u2014 ${preHookCommand}`);
@@ -464,7 +469,7 @@ var main = async () => {
     if (hooksInstalled) {
       const missingEvents = missingCodexHookEvents(codexHooksConfig);
       check(missingEvents.length === 0, "Codex: native hooks installed", missingEvents.length === 0 ? "all 6 events" : `missing ${missingEvents.join(", ")}, re-run setup`);
-      const hookCommand = extractHookCommand(codexHooksConfig.hooks?.PreToolUse, "pushary-codex-hook") ?? extractHookCommand(codexHooksConfig.hooks?.PermissionRequest, "pushary-codex-hook");
+      const hookCommand = extractAgentHookCommand(codexHooksConfig.hooks?.PreToolUse, "pushary-codex-hook") ?? extractAgentHookCommand(codexHooksConfig.hooks?.PermissionRequest, "pushary-codex-hook");
       if (hookCommand) {
         const resolves = commandResolves(hookCommand);
         check(resolves, "Codex: hook command resolves", resolves ? hookCommand : `not on PATH: ${hookCommand}`);
@@ -525,12 +530,12 @@ var main = async () => {
       const missingEvents = missingGeminiHookEvents(geminiSettings2);
       check(missingEvents.length === 0, "Gemini CLI: native hooks installed", missingEvents.length === 0 ? "all 5 events" : `missing ${missingEvents.join(", ")}, re-run setup`);
       const geminiHooks = geminiSettings2.hooks;
-      const hookCommand = extractHookCommand(geminiHooks?.BeforeTool, GEMINI_HOOK_BINARY) ?? extractHookCommand(geminiHooks?.AfterTool, GEMINI_HOOK_BINARY) ?? extractHookCommand(geminiHooks?.SessionStart, GEMINI_HOOK_BINARY);
+      const hookCommand = extractAgentHookCommand(geminiHooks?.BeforeTool, GEMINI_HOOK_BINARY) ?? extractAgentHookCommand(geminiHooks?.AfterTool, GEMINI_HOOK_BINARY) ?? extractAgentHookCommand(geminiHooks?.SessionStart, GEMINI_HOOK_BINARY);
       if (hookCommand) {
         const resolves = commandResolves(hookCommand);
         check(resolves, "Gemini CLI: hook command resolves", resolves ? hookCommand : `not on PATH: ${hookCommand}`);
       }
-      const geminiTimeout = extractHookTimeout(geminiHooks?.BeforeTool, GEMINI_HOOK_BINARY);
+      const geminiTimeout = extractHookTimeout(geminiHooks?.BeforeTool, GEMINI_HOOK_BINARY) ?? extractHookTimeout(geminiHooks?.BeforeTool, HOOK_LOCATOR_BINARY);
       if (typeof geminiTimeout === "number") {
         const ok = geminiTimeout >= 3e4;
         check(ok, "Gemini CLI: hook timeout", ok ? `${geminiTimeout}ms` : `${geminiTimeout}ms too short (Gemini timeouts are milliseconds) \u2014 re-run setup`);

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

@@ -11,7 +11,7 @@ import {
   cancelQuestion,
   pollForAnswer,
   savePendingQuestion
-} from "../chunk-J3YDT4HM.js";
+} from "../chunk-HUJAAWNL.js";
 import {
   getMachineId
 } from "../chunk-RN3NOEJF.js";

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

@@ -216,7 +216,11 @@ var runGeminiBridge = async (options) => {
           await liveSessionSleep(options.pollIntervalMs ?? 2e3, options.signal);
           continue;
         }
-        const response = await postLiveSession(options, "/api/agent/command/drain", { sessionId, ackMode: true });
+        const response = await postLiveSession(options, "/api/agent/command/drain", {
+          sessionId,
+          machineId: options.machineId,
+          ackMode: true
+        });
         if (response.ok) {
           const command = object((await response.json()).command);
           const commandId = string(command?.id);
@@ -225,10 +229,17 @@ var runGeminiBridge = async (options) => {
             try {
               const outcome2 = await turn(text, commandId);
               if (outcome2 === "aborted") break;
-              pendingAck = { commandId, state: "delivered" };
+              pendingAck = {
+                commandId,
+                sessionId,
+                machineId: options.machineId,
+                state: "delivered"
+              };
             } catch (error) {
               pendingAck = {
                 commandId,
+                sessionId,
+                machineId: options.machineId,
                 state: "failed",
                 failureCode: "gemini_rejected",
                 failureMessage: (error instanceof Error ? error.message : String(error)).slice(0, 240)

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

@@ -21,7 +21,7 @@ import {
   readLastUserPrompt,
   repoKeyFor,
   reportEvent
-} from "../chunk-6XSC6Z2K.js";
+} from "../chunk-3UBYTSCY.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -29,7 +29,7 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "../chunk-J3YDT4HM.js";
+} from "../chunk-HUJAAWNL.js";
 import {
   deriveActionBody,
   deriveBlocker,

package/dist/bin/pushary-hook.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import {
   handlePreToolUse
-} from "../chunk-HEQVIIBN.js";
+} from "../chunk-JT6TIBYH.js";
 import "../chunk-ATBKJNWS.js";
 import "../chunk-VZKXBFUA.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
 import "../chunk-YHG74UFF.js";
-import "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+import "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import {

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

@@ -4,8 +4,8 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleNotification
-} from "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+} from "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";

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

@@ -19,7 +19,7 @@ import {
   policyRequestFor,
   readLastPrompt,
   repoKeyFor
-} from "../chunk-6XSC6Z2K.js";
+} from "../chunk-3UBYTSCY.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -27,7 +27,7 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "../chunk-J3YDT4HM.js";
+} from "../chunk-HUJAAWNL.js";
 import {
   OPENCODE_TOOL_NAMES,
   deriveActionBody,

package/dist/bin/pushary-permission-denied-hook.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import {
   handlePermissionDenied
-} from "../chunk-HEQVIIBN.js";
+} from "../chunk-JT6TIBYH.js";
 import "../chunk-ATBKJNWS.js";
 import "../chunk-VZKXBFUA.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
 import "../chunk-YHG74UFF.js";
-import "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+import "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";

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

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import {
   handlePermissionRequest
-} from "../chunk-HEQVIIBN.js";
+} from "../chunk-JT6TIBYH.js";
 import "../chunk-ATBKJNWS.js";
 import "../chunk-VZKXBFUA.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
 import "../chunk-YHG74UFF.js";
-import "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+import "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";

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

@@ -4,8 +4,8 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handlePostToolUse
-} from "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+} from "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";

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

@@ -4,8 +4,8 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleUserPrompt
-} from "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+} from "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";

package/dist/bin/pushary-session-end-hook.js

@@ -4,8 +4,8 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleSessionEnd
-} from "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+} from "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";

package/dist/bin/pushary-session-start-hook.js

@@ -4,8 +4,8 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleSessionStart
-} from "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+} from "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";

package/dist/bin/pushary-setup.js

@@ -6,7 +6,7 @@ import {
   claudeWired,
   codexWired,
   geminiWired
-} from "../chunk-4VYUMYWD.js";
+} from "../chunk-3O2XPYLF.js";
 import {
   runBrowserLogin
 } from "../chunk-Z3Z4VK5F.js";
@@ -82,8 +82,8 @@ import {
 import "../chunk-GIRT7677.js";
 import {
   reportEvent
-} from "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+} from "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import {

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

@@ -4,8 +4,8 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleStop
-} from "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+} from "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";

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

@@ -4,8 +4,8 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleStopFailure
-} from "../chunk-6XSC6Z2K.js";
-import "../chunk-J3YDT4HM.js";
+} from "../chunk-3UBYTSCY.js";
+import "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";

package/dist/{chunk-4VYUMYWD.js → chunk-3O2XPYLF.js}

@@ -4,15 +4,29 @@ import {
 import {
   hasCodexHooks
 } from "./chunk-VKVHY5HD.js";
+import {
+  HOOK_LOCATOR_BINARY
+} from "./chunk-L4C2JXJS.js";
 
 // src/diagnostics/wiring.ts
 var record = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;
 var CLAUDE_HOOK_BINARY = /pushary-[a-z-]*hook/;
+var EXACT_HOOK_BINARY = /^pushary-[a-z-]*hook$/;
+var pusharyHookExecutable = (command) => {
+  const tokens = command.match(/"[^"]*"|'[^']*'|\S+/g) ?? [];
+  for (const raw of tokens.reverse()) {
+    const token = raw[0] === '"' && raw.at(-1) === '"' || raw[0] === "'" && raw.at(-1) === "'" ? raw.slice(1, -1) : raw;
+    const name = token.split(/[/\\]/).pop()?.replace(/\.(cmd|exe)$/i, "") ?? "";
+    if (name === HOOK_LOCATOR_BINARY || EXACT_HOOK_BINARY.test(name)) return token;
+  }
+  return null;
+};
 var claudeWired = ({ claudeJson, settings, skillExists }) => {
   if (record(record(claudeJson)?.mcpServers)?.pushary) return true;
   const s = record(settings);
   if (s) {
-    if (CLAUDE_HOOK_BINARY.test(JSON.stringify(s.hooks ?? {}))) return true;
+    const hooks = JSON.stringify(s.hooks ?? {});
+    if (CLAUDE_HOOK_BINARY.test(hooks) || hooks.includes(HOOK_LOCATOR_BINARY)) return true;
     const allow = record(s.permissions)?.allow;
     if (Array.isArray(allow) && allow.some((rule) => String(rule).includes("mcp__pushary__"))) return true;
   }
@@ -32,6 +46,7 @@ var geminiWired = ({ settings }) => {
 };
 
 export {
+  pusharyHookExecutable,
   claudeWired,
   codexWired,
   geminiWired

package/dist/{chunk-6XSC6Z2K.js → chunk-3UBYTSCY.js}

@@ -4,11 +4,15 @@ import {
   isDefaultSession,
   isPolicyConfig,
   listPendingQuestions,
+  markPendingCommandDelivered,
+  readPendingCommand,
+  removePendingCommand,
   removePendingQuestion,
   removePendingSession,
+  savePendingCommand,
   sendNotification,
   waitForAnswer
-} from "./chunk-J3YDT4HM.js";
+} from "./chunk-HUJAAWNL.js";
 import {
   AGENT_IDENTITIES,
   deriveReceiptMeta,
@@ -666,10 +670,31 @@ var consumesActivityContext = (agentType) => {
   return pendingCommandEvents(source).some((event) => event !== "Stop");
 };
 var detectInstallMode = () => (process.argv[1] ?? "").includes("_npx") ? "npx" : "cli";
+var acknowledgePendingCommand = async (apiKey, baseUrl, commandId, sessionId, machineId, timeoutMs) => {
+  try {
+    const response = await fetch(`${baseUrl}/api/agent/command/ack`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization": `Bearer ${apiKey}`
+      },
+      body: JSON.stringify({ commandId, sessionId: sessionId ?? null, machineId, state: "delivered" }),
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    return response.ok;
+  } catch {
+    return false;
+  }
+};
 var reportEvent = async (event, options = {}) => {
   const apiKey = options.apiKey ?? getApiKey();
   const baseUrl = getBaseUrl();
+  const machineId = event.machineId ?? getMachineId();
+  const sessionKey = event.sessionId || DEFAULT_SESSION;
+  const receiptNamespace = `${apiKey}:${machineId}:${event.agentType}`;
+  const clientCanDrain = consumesActivityContext(event.agentType) && options.timeoutMs === void 0;
   return withRetry(async () => {
+    const storedCommand = clientCanDrain ? readPendingCommand(sessionKey, receiptNamespace) : null;
     const res = await fetch(`${baseUrl}/api/agent/event`, {
       method: "POST",
       headers: {
@@ -678,7 +703,7 @@ var reportEvent = async (event, options = {}) => {
       },
       body: JSON.stringify({
         ...event,
-        machineId: event.machineId ?? getMachineId(),
+        machineId,
         // Lets the phone's Stop end this process instead of only denying its next
         // tool call. Ours alone: never another process, never a parent.
         pid: event.pid,
@@ -693,27 +718,54 @@ var reportEvent = async (event, options = {}) => {
         // Link-back for a phone-spawned session: forward the spawn id the daemon
         // set in the environment so the server can map spawnId -> sessionId.
         ...process.env.PUSHARY_SPAWN_ID ? { spawnId: process.env.PUSHARY_SPAWN_ID } : {},
-        // Advertise that this client reads `pendingCommand` back off the
-        // response, so the server may drain the phone-queued instruction on
-        // activity events (tool_complete/tool_error/user_prompt), not only Stop.
-        // Only Claude Code consumes additionalContext from these hooks; Codex and
-        // Gemini keep their existing session_end-only drain, so they must NOT
-        // advertise it or the server would pop-and-drop their queued command.
-        //
-        // And only when this caller kept the full budget. The pop is a destructive
-        // LPOP that happens before the response is written, so a caller that
-        // abandons the request destroys the message: `user_prompt` runs on a human
-        // keystroke and gave it 800ms, which a cold function misses routinely.
-        // Asking the server to consume something we may not wait to receive is the
-        // one shape that loses it outright, and the instruction reaches the agent
-        // on its next tool call instead.
-        canDrainCommand: consumesActivityContext(event.agentType) && options.timeoutMs === void 0
+        canDrainCommand: clientCanDrain && !storedCommand,
+        ackMode: clientCanDrain && !storedCommand,
+        skipCommandDrain: storedCommand != null
       }),
       signal: AbortSignal.timeout(options.timeoutMs ?? 1e4)
     });
     if (options.requireOk && !res.ok) throw new Error(`/api/agent/event rejected (${res.status})`);
     try {
-      return await res.json();
+      const result = await res.json();
+      const withoutPending = () => ({ ...result, pendingCommand: void 0, pendingCommandId: void 0 });
+      if (storedCommand) {
+        const acknowledged = await acknowledgePendingCommand(
+          apiKey,
+          baseUrl,
+          storedCommand.id,
+          event.sessionId,
+          machineId,
+          options.timeoutMs ?? 1e4
+        );
+        if (!acknowledged) return withoutPending();
+        if (storedCommand.delivered) {
+          removePendingCommand(sessionKey, storedCommand.id, receiptNamespace);
+          return withoutPending();
+        }
+        if (!markPendingCommandDelivered(sessionKey, storedCommand.id, receiptNamespace)) return withoutPending();
+        return { ...withoutPending(), pendingCommand: storedCommand.text, pendingCommandId: storedCommand.id };
+      }
+      if (typeof result.pendingCommandId === "string" && typeof result.pendingCommand === "string") {
+        const saved = savePendingCommand(sessionKey, {
+          id: result.pendingCommandId,
+          text: result.pendingCommand,
+          expiresAtMs: typeof result.pendingCommandExpiresAtMs === "number" ? result.pendingCommandExpiresAtMs : Date.now() + 36e5,
+          delivered: false
+        }, receiptNamespace);
+        if (!saved) return withoutPending();
+        const acknowledged = await acknowledgePendingCommand(
+          apiKey,
+          baseUrl,
+          result.pendingCommandId,
+          event.sessionId,
+          machineId,
+          options.timeoutMs ?? 1e4
+        );
+        if (!acknowledged || !markPendingCommandDelivered(sessionKey, result.pendingCommandId, receiptNamespace)) {
+          return withoutPending();
+        }
+      }
+      return result;
     } catch {
       return null;
     }
@@ -810,9 +862,6 @@ var handleStop = async (input, agent = CLAUDE_CODE_AGENT) => {
     const sessionKey = input.session_id || DEFAULT_SESSION;
     const late = await reconcilePendingQuestions(sessionKey);
     const tasks = [
-      // maxAttempts:1 for the same reason as the activity-event drains: session_end
-      // always pops the command server-side (single-use LPOP), so a retry after a
-      // slow-but-successful response would pop a second command and drop the first.
       reportEvent({
         event: "session_end",
         agentType: agent.type,

package/dist/{chunk-J3YDT4HM.js → chunk-HUJAAWNL.js}

@@ -68,13 +68,68 @@ var sendNotification = async (apiKey, params, timeoutMs = 15e3) => {
 
 // src/pending.ts
 import { join } from "path";
-import { tmpdir } from "os";
-import { existsSync, mkdirSync, writeFileSync, readdirSync, unlinkSync, rmSync, statSync } from "fs";
+import { homedir, tmpdir } from "os";
+import { createHash } from "crypto";
+import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, renameSync, unlinkSync, rmSync, statSync } from "fs";
 var PENDING_DIR = join(tmpdir(), "pushary-pending");
+var COMMAND_DIR = join(homedir(), ".pushary", "run", "commands");
 var DEFAULT_SESSION = "_no_session";
 var GRACE_MS = 10 * 60 * 1e3;
 var sanitize = (sessionId) => sessionId.replace(/[^A-Za-z0-9_-]/g, "_").slice(0, 128) || DEFAULT_SESSION;
 var dirFor = (sessionId) => join(PENDING_DIR, sanitize(sessionId));
+var commandDirFor = (sessionId, namespace = "") => join(
+  COMMAND_DIR,
+  createHash("sha256").update(namespace).digest("hex").slice(0, 16),
+  sanitize(sessionId)
+);
+var commandFile = (sessionId, namespace = "") => join(commandDirFor(sessionId, namespace), "command.json");
+var readPendingCommand = (sessionId, namespace = "") => {
+  try {
+    const value = JSON.parse(readFileSync(commandFile(sessionId, namespace), "utf-8"));
+    if (typeof value.id !== "string" || typeof value.text !== "string" || typeof value.expiresAtMs !== "number") return null;
+    if (value.expiresAtMs <= Date.now()) {
+      unlinkSync(commandFile(sessionId, namespace));
+      return null;
+    }
+    return { ...value, delivered: value.delivered === true };
+  } catch {
+    return null;
+  }
+};
+var savePendingCommand = (sessionId, command, namespace = "") => {
+  const dir = commandDirFor(sessionId, namespace);
+  try {
+    mkdirSync(dir, { recursive: true, mode: 448 });
+    writeFileSync(commandFile(sessionId, namespace), JSON.stringify(command), { encoding: "utf-8", mode: 384, flag: "wx" });
+    return true;
+  } catch {
+    return false;
+  }
+};
+var markPendingCommandDelivered = (sessionId, id, namespace = "") => {
+  const command = readPendingCommand(sessionId, namespace);
+  if (!command || command.id !== id) return false;
+  const file = commandFile(sessionId, namespace);
+  const temporary = `${file}.${process.pid}.tmp`;
+  try {
+    writeFileSync(temporary, JSON.stringify({ ...command, delivered: true }), { encoding: "utf-8", mode: 384 });
+    renameSync(temporary, file);
+    return true;
+  } catch {
+    try {
+      unlinkSync(temporary);
+    } catch {
+    }
+    return false;
+  }
+};
+var removePendingCommand = (sessionId, id, namespace = "") => {
+  if (readPendingCommand(sessionId, namespace)?.id !== id) return;
+  try {
+    unlinkSync(commandFile(sessionId, namespace));
+  } catch {
+  }
+};
 var isDefaultSession = (sessionId) => sanitize(sessionId) === DEFAULT_SESSION;
 var savePendingQuestion = (sessionId, correlationId) => {
   const dir = dirFor(sessionId);
@@ -120,6 +175,10 @@ export {
   cancelQuestion,
   sendNotification,
   DEFAULT_SESSION,
+  readPendingCommand,
+  savePendingCommand,
+  markPendingCommandDelivered,
+  removePendingCommand,
   isDefaultSession,
   savePendingQuestion,
   listPendingQuestions,

package/dist/{chunk-HEQVIIBN.js → chunk-JT6TIBYH.js}

@@ -17,7 +17,7 @@ import {
   readLastUserPrompt,
   repoKeyFor,
   throttlePass
-} from "./chunk-6XSC6Z2K.js";
+} from "./chunk-3UBYTSCY.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -25,7 +25,7 @@ import {
   pollForAnswer,
   savePendingQuestion,
   sendNotification
-} from "./chunk-J3YDT4HM.js";
+} from "./chunk-HUJAAWNL.js";
 import {
   deriveAction,
   deriveActionBody,

package/dist/src/index.d.ts

@@ -68,6 +68,8 @@ interface ReportEventOptions {
 interface EventResponse {
     readonly ok?: boolean;
     readonly pendingCommand?: string;
+    readonly pendingCommandId?: string;
+    readonly pendingCommandExpiresAtMs?: number;
 }
 declare const reportEvent: (event: AgentEvent, options?: ReportEventOptions) => Promise<EventResponse | null>;
 declare const handlePostToolUse: (input: {

package/dist/src/index.js

@@ -1,6 +1,6 @@
 import {
   handlePreToolUse
-} from "../chunk-HEQVIIBN.js";
+} from "../chunk-JT6TIBYH.js";
 import "../chunk-ATBKJNWS.js";
 import "../chunk-VZKXBFUA.js";
 import "../chunk-YHG74UFF.js";
@@ -12,12 +12,12 @@ import {
   handlePostToolUse,
   handleStop,
   reportEvent
-} from "../chunk-6XSC6Z2K.js";
+} from "../chunk-3UBYTSCY.js";
 import {
   askUser,
   cancelQuestion,
   waitForAnswer
-} from "../chunk-J3YDT4HM.js";
+} from "../chunk-HUJAAWNL.js";
 import "../chunk-LGXTBUT4.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushary/agent-hooks",
-  "version": "0.89.2",
+  "version": "0.89.3",
   "description": "Permission hooks for AI coding agents: route tool approvals through Pushary push notifications",
   "keywords": [
     "pushary",