@pushary/agent-hooks 0.31.0 → 0.32.2

package/data/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: pushary
-version: 0.4.1
+version: 0.4.2
 description: Push notifications and human-in-the-loop for AI coding agents. Send alerts when tasks finish, ask questions (yes/no, multiple choice, or free text) via push, and get answers from the user's lock screen. Use these tools proactively — do not wait for the user to ask for notifications. Works with Cursor, Claude Code, Windsurf, Hermes, and any MCP client.
 metadata:
   hermes:
@@ -248,7 +248,7 @@ Cancel a pending question so it can no longer be answered. Use when the question
 
 ## Permission Gating (REQUIRED)
 
-Before executing any of the following, you MUST call `ask_user` with type "confirm" and wait for approval. Do NOT proceed without an explicit "yes" from the user:
+Before executing any of the following, make sure the user has approved it. Call `ask_user` with type "confirm" and wait for an explicit "yes" before you proceed:
 
 - File deletion (`rm`, `unlink`, any destructive file operation)
 - Database mutations (`DROP`, `DELETE`, `TRUNCATE`, migrations)
@@ -258,6 +258,10 @@ Before executing any of the following, you MUST call `ask_user` with type "confi
 - Network configuration changes (firewall, DNS, proxy)
 - Any command the user has flagged as dangerous
 
+Honor the user's delivery mode: it decides WHERE approval is requested (phone, terminal, or awareness only), not WHETHER approval is required. In "Terminal" mode the user wants to approve at the keyboard, so do not force a phone push; a single terminal approval is enough.
+
+If the Pushary hook is installed, it also gates these at the tool level and routes them by delivery mode. When it has already surfaced the approval for an action, one "yes" is enough, do not ask a second time for the same action.
+
 If `ask_user` returns `answered: false`, do NOT execute the command. Send a notification that the operation was skipped due to no response.
 
 This is not optional. Treat it as a hard constraint, not a suggestion.

package/dist/bin/pushary-claude.d.ts

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

package/dist/bin/pushary-claude.js

@@ -0,0 +1,175 @@
+#!/usr/bin/env node
+import {
+  getApiKey
+} from "../chunk-NKXSILEW.js";
+
+// src/wrapper/claudeBinary.ts
+import { statSync } from "fs";
+import { join, delimiter } from "path";
+var WRAPPER_ACTIVE_ENV = "PUSHARY_WRAPPER_ACTIVE";
+var isFile = (path) => {
+  try {
+    return statSync(path).isFile();
+  } catch {
+    return false;
+  }
+};
+var findClaudeBinary = () => {
+  const override = process.env.PUSHARY_CLAUDE_BIN?.trim();
+  if (override) return isFile(override) ? override : null;
+  const pathVar = process.env.PATH ?? "";
+  const exts = process.platform === "win32" ? [".cmd", ".exe", ".bat", ""] : [""];
+  for (const dir of pathVar.split(delimiter)) {
+    if (!dir) continue;
+    for (const ext of exts) {
+      const candidate = join(dir, `claude${ext}`);
+      if (isFile(candidate)) return candidate;
+    }
+  }
+  return null;
+};
+
+// src/wrapper/localPassthrough.ts
+import { spawn } from "child_process";
+var SIGNAL_NUMBERS = {
+  SIGHUP: 1,
+  SIGINT: 2,
+  SIGQUIT: 3,
+  SIGKILL: 9,
+  SIGTERM: 15
+};
+var FORWARDED_SIGNALS = ["SIGINT", "SIGTERM", "SIGHUP"];
+var runLocalPassthrough = (binary, args2) => {
+  return new Promise((resolve) => {
+    let child;
+    try {
+      child = spawn(binary, args2, {
+        stdio: "inherit",
+        env: { ...process.env, [WRAPPER_ACTIVE_ENV]: "1" }
+      });
+    } catch {
+      resolve(127);
+      return;
+    }
+    const forward = (signal) => {
+      try {
+        child.kill(signal);
+      } catch {
+      }
+    };
+    for (const signal of FORWARDED_SIGNALS) process.on(signal, forward);
+    const cleanup = () => {
+      for (const signal of FORWARDED_SIGNALS) process.off(signal, forward);
+    };
+    child.on("error", () => {
+      cleanup();
+      resolve(127);
+    });
+    child.on("exit", (code, signal) => {
+      cleanup();
+      if (typeof code === "number") resolve(code);
+      else if (signal) resolve(128 + (SIGNAL_NUMBERS[signal] ?? 0));
+      else resolve(0);
+    });
+  });
+};
+
+// src/wrapper/commandPoller.ts
+var FAST_POLL_MS = 2e3;
+var SLOW_POLL_MS = 3e4;
+var isEnabled = () => {
+  const flag = process.env.PUSHARY_WRAPPER_POLL;
+  return flag === "1" || flag === "true";
+};
+var startCommandPoller = (opts) => {
+  let stopped = false;
+  let timer;
+  if (!isEnabled()) return { stop() {
+  } };
+  try {
+    getApiKey();
+  } catch {
+    return { stop() {
+    } };
+  }
+  const schedule = (delayMs) => {
+    if (stopped) return;
+    timer = setTimeout(tick, delayMs);
+  };
+  const tick = async () => {
+    if (stopped) return;
+    let next = SLOW_POLL_MS;
+    try {
+      const command = await drainPendingCommand(opts.sessionId);
+      if (command) {
+        next = FAST_POLL_MS;
+        opts.onCommand(command);
+      }
+    } catch {
+    }
+    schedule(next);
+  };
+  opts.log?.("[pushary] wrapper command poller enabled (experimental)");
+  schedule(SLOW_POLL_MS);
+  return {
+    stop() {
+      stopped = true;
+      if (timer) clearTimeout(timer);
+    }
+  };
+};
+var drainPendingCommand = async (_sessionId) => {
+  return null;
+};
+
+// src/wrapper/remoteMode.ts
+var runRemoteMode = async (_binary, _args) => {
+  return { implemented: false };
+};
+
+// src/wrapper/runClaudeWrapper.ts
+var runClaudeWrapper = async (args2) => {
+  const binary = findClaudeBinary();
+  if (!binary) {
+    process.stderr.write(
+      "[pushary] Could not find the `claude` binary on your PATH. Install Claude Code, or set PUSHARY_CLAUDE_BIN to its full path.\n"
+    );
+    return 127;
+  }
+  const nested = process.env[WRAPPER_ACTIVE_ENV] === "1";
+  if (!nested && process.env.PUSHARY_WRAPPER_REMOTE === "1") {
+    try {
+      const remote = await runRemoteMode(binary, args2);
+      if (remote.implemented) return remote.exitCode ?? 0;
+    } catch {
+    }
+  }
+  const poller = nested ? { stop() {
+  } } : startCommandPoller({
+    onCommand: () => {
+    },
+    log: (m) => process.stderr.write(`${m}
+`)
+  });
+  try {
+    return await runLocalPassthrough(binary, args2);
+  } finally {
+    poller.stop();
+  }
+};
+
+// src/wrapper/args.ts
+var resolveClaudeArgs = (argv) => {
+  const rest = argv.slice(2);
+  return rest[0] === "claude" ? rest.slice(1) : rest;
+};
+
+// bin/pushary-claude.ts
+var args = resolveClaudeArgs(process.argv);
+runClaudeWrapper(args).then((code) => process.exit(code)).catch((err) => {
+  process.stderr.write(
+    `[pushary] wrapper error: ${err instanceof Error ? err.message : String(err)}
+`
+  );
+  process.exit(1);
+});

package/dist/bin/pushary-clean.js

@@ -2,12 +2,12 @@
 import {
   removeClaudeMcpServers,
   removePusharySettings
-} from "../chunk-H3LQRYMW.js";
+} from "../chunk-M6YUEVRV.js";
 import {
   removeCodexHooks,
   removeGeminiSettings,
   removeInstructionBlock
-} from "../chunk-WUNVKFFY.js";
+} from "../chunk-SVVEC4QV.js";
 import {
   execNpm
 } from "../chunk-J7JWI3KU.js";

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

@@ -3,10 +3,6 @@ import {
   denyReasonFrom,
   isDeferAnswer
 } from "../chunk-KQYIHZ5E.js";
-import {
-  isGatingMoment,
-  recordKeylessMoment
-} from "../chunk-R5AJNXZS.js";
 import {
   CODEX_AGENT,
   DEFAULT_SESSION,
@@ -36,7 +32,11 @@ import {
   toCodexWire,
   toPolicyLookup,
   waitForAnswer
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-P7B3U6DR.js";
+import {
+  isGatingMoment,
+  recordKeylessMoment
+} from "../chunk-R5AJNXZS.js";
 import "../chunk-DWED7BS3.js";
 import {
   DECISION_LINE_MAX,

package/dist/bin/pushary-codex.js

@@ -4,7 +4,7 @@ import {
   getMachineId,
   reportEvent,
   waitForAnswer
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-P7B3U6DR.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-Z5PL3K7C.js";
 import {

package/dist/bin/pushary-doctor.js

@@ -11,7 +11,7 @@ import {
   missingGeminiHookEvents,
   readCodexMcpAuth,
   untrustedCodexHookEvents
-} from "../chunk-WUNVKFFY.js";
+} from "../chunk-SVVEC4QV.js";
 import {
   execNpm
 } from "../chunk-J7JWI3KU.js";

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

@@ -3,10 +3,6 @@ import {
   denyReasonFrom,
   isDeferAnswer
 } from "../chunk-KQYIHZ5E.js";
-import {
-  isGatingMoment,
-  recordKeylessMoment
-} from "../chunk-R5AJNXZS.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -28,7 +24,11 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-P7B3U6DR.js";
+import {
+  isGatingMoment,
+  recordKeylessMoment
+} from "../chunk-R5AJNXZS.js";
 import "../chunk-DWED7BS3.js";
 import {
   DECISION_LINE_MAX,

package/dist/bin/pushary-hook.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   handlePreToolUse
-} from "../chunk-CY5YP34L.js";
+} from "../chunk-2AMV2BDM.js";
 import "../chunk-KQYIHZ5E.js";
+import "../chunk-P7B3U6DR.js";
 import "../chunk-R5AJNXZS.js";
-import "../chunk-IAOXM7X5.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-Z5PL3K7C.js";
 import "../chunk-NKXSILEW.js";

package/dist/bin/pushary-notification-hook.d.ts

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

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

@@ -0,0 +1,24 @@
+#!/usr/bin/env node
+import {
+  handleNotification
+} from "../chunk-P7B3U6DR.js";
+import "../chunk-DWED7BS3.js";
+import "../chunk-Z5PL3K7C.js";
+import "../chunk-NKXSILEW.js";
+
+// bin/pushary-notification-hook.ts
+var main = async () => {
+  let rawInput = "";
+  for await (const chunk of process.stdin) {
+    rawInput += chunk;
+  }
+  if (!rawInput.trim()) {
+    process.exit(0);
+  }
+  try {
+    const input = JSON.parse(rawInput);
+    await handleNotification(input);
+  } catch {
+  }
+};
+main();

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   handlePostToolUse
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-P7B3U6DR.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-Z5PL3K7C.js";
 import "../chunk-NKXSILEW.js";

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   handleUserPrompt
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-P7B3U6DR.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-Z5PL3K7C.js";
 import "../chunk-NKXSILEW.js";

package/dist/bin/pushary-setup.js

@@ -3,7 +3,7 @@ import {
   addClaudeMcpServer,
   addPusharyHooks,
   addPusharyToolPermissions
-} from "../chunk-H3LQRYMW.js";
+} from "../chunk-M6YUEVRV.js";
 import {
   GEMINI_HOOK_BINARY,
   addCodexHookTrust,
@@ -14,7 +14,7 @@ import {
   renderAgentInstructions,
   renderProjectAgentInstructions,
   writeInstructionBlock
-} from "../chunk-WUNVKFFY.js";
+} from "../chunk-SVVEC4QV.js";
 import {
   execNpm,
   npmErrorMessage,
@@ -24,7 +24,7 @@ import {
 } from "../chunk-J7JWI3KU.js";
 import {
   reportEvent
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-P7B3U6DR.js";
 import "../chunk-DWED7BS3.js";
 import {
   isValidApiKey

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   handleStop
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-P7B3U6DR.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-Z5PL3K7C.js";
 import "../chunk-NKXSILEW.js";

package/dist/bin/pushary.js

@@ -18,12 +18,15 @@ if (command === "setup") {
   await import("./pushary-stats.js");
 } else if (command === "upgrade") {
   await import("./pushary-upgrade.js");
+} else if (command === "claude") {
+  await import("./pushary-claude.js");
 } else {
   console.log(`
 Pushary Agent Hooks
 
 Commands:
   setup    Configure Claude Code, Codex, Gemini CLI, Hermes, or Cursor with Pushary
+  claude   Run Claude Code through Pushary (experimental wrapper; today a transparent passthrough)
   doctor   Verify your Pushary installation is working
   clean    Remove all Pushary configuration (--yes for non-interactive)
   mode     Switch approval mode (push_only, push_first, terminal_only)

package/dist/{chunk-CY5YP34L.js → chunk-2AMV2BDM.js}

@@ -2,10 +2,6 @@ import {
   denyReasonFrom,
   isDeferAnswer
 } from "./chunk-KQYIHZ5E.js";
-import {
-  isGatingMoment,
-  recordKeylessMoment
-} from "./chunk-R5AJNXZS.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -24,7 +20,11 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "./chunk-IAOXM7X5.js";
+} from "./chunk-P7B3U6DR.js";
+import {
+  isGatingMoment,
+  recordKeylessMoment
+} from "./chunk-R5AJNXZS.js";
 import {
   effectiveWaitSeconds,
   hookWaitClamped,
@@ -98,7 +98,7 @@ var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, ti
       case "deny":
         return deny("Push notification failed, denying per policy");
       default:
-        return ask("Push notification failed, asking in terminal");
+        return void 0;
     }
   }
   if (result.suppressed) {
@@ -113,7 +113,7 @@ var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, ti
       case "deny":
         return deny("No device connected to approve on");
       default:
-        return ask("No device connected \u2014 asking in terminal");
+        return void 0;
     }
   }
   const effectiveWait = effectiveWaitSeconds(timeoutAction, timeoutSeconds, "claude");
@@ -156,7 +156,7 @@ var handlePushFirst = async (apiKey, description, projectName, pushFirstSeconds,
       ...decision
     });
   } catch {
-    return ask("Push notification failed, asking in terminal");
+    return void 0;
   }
   if (result.suppressed) {
     await cancelQuestion(apiKey, result.correlationId).catch(() => {
@@ -164,7 +164,7 @@ var handlePushFirst = async (apiKey, description, projectName, pushFirstSeconds,
     return ask("You are at the keyboard \u2014 approve here.");
   }
   if (result.noDevices) {
-    return ask("No device connected \u2014 asking in terminal.");
+    return void 0;
   }
   const deadline = hookWaitDeadline(START_MS, pushFirstSeconds, "claude", Date.now());
   const answer = await pollForAnswer(apiKey, result.correlationId, deadline, 1500);
@@ -200,6 +200,12 @@ var keylessNoticeOnce = (sessionId) => {
   } catch {
   }
 };
+var DEFER_PERMISSION_MODES = /* @__PURE__ */ new Set(["bypassPermissions", "plan", "auto"]);
+var shouldDeferToNativeMode = (permissionMode) => {
+  const flag = process.env.PUSHARY_RESPECT_PERMISSION_MODE;
+  if (flag !== "1" && flag !== "true") return false;
+  return typeof permissionMode === "string" && DEFER_PERMISSION_MODES.has(permissionMode);
+};
 var handleKeyless = (input) => {
   try {
     if (isGatingMoment(input.tool_name, input.tool_input ?? {})) {
@@ -216,6 +222,7 @@ var handleKeyless = (input) => {
   return void 0;
 };
 var handlePreToolUse = async (input) => {
+  if (input.tool_name.startsWith("mcp__pushary__")) return void 0;
   let apiKey;
   try {
     apiKey = getApiKey();
@@ -228,6 +235,9 @@ var handlePreToolUse = async (input) => {
     if (modeState.kill) {
       return deny("Stopped by user \u2014 this agent was halted from Pushary");
     }
+    if (shouldDeferToNativeMode(input.permission_mode)) {
+      return void 0;
+    }
     const toolPolicy = resolvePolicy(policy, input.tool_name, modeState.mode, input.tool_input);
     if (toolPolicy.timeoutSeconds === 0 && toolPolicy.timeoutAction === "approve") {
       return allow();
@@ -260,7 +270,7 @@ var handlePreToolUse = async (input) => {
         return handlePushFirst(apiKey, description, projectName, toolPolicy.pushFirstSeconds, sessionId, machineId, input.tool_name, toolTarget, decision);
     }
   } catch {
-    return ask("Pushary unavailable, falling back to terminal approval");
+    return void 0;
   }
 };
 

package/dist/{chunk-H3LQRYMW.js → chunk-M6YUEVRV.js}

@@ -20,7 +20,7 @@ var isPusharyHook = (entry) => {
   if (!Array.isArray(hooks)) return false;
   return hooks.some((hook) => {
     const command = String(asRecord(hook)?.command ?? "");
-    return command.includes("pushary-hook") || command.includes("pushary-post-hook") || command.includes("pushary-stop-hook") || command.includes("pushary-prompt-hook");
+    return command.includes("pushary-hook") || command.includes("pushary-post-hook") || command.includes("pushary-stop-hook") || command.includes("pushary-prompt-hook") || command.includes("pushary-notification-hook");
   });
 };
 var addClaudeMcpServer = (config, apiKey) => {
@@ -67,7 +67,7 @@ var addPusharyHooks = (settings, binDir) => {
   const hooks = ensureRecord(settings, "hooks");
   const preToolUse = (Array.isArray(hooks.PreToolUse) ? hooks.PreToolUse : []).filter((entry) => !isPusharyHook(entry));
   preToolUse.push({
-    matcher: "Bash|Write|Edit",
+    matcher: "Bash|Write|Edit|NotebookEdit",
     hooks: [{
       type: "command",
       command: resolve("pushary-hook"),
@@ -77,7 +77,7 @@ var addPusharyHooks = (settings, binDir) => {
   hooks.PreToolUse = preToolUse;
   const postToolUse = (Array.isArray(hooks.PostToolUse) ? hooks.PostToolUse : []).filter((entry) => !isPusharyHook(entry));
   postToolUse.push({
-    matcher: "Bash|Write|Edit",
+    matcher: "Bash|Write|Edit|NotebookEdit",
     hooks: [{
       type: "command",
       command: resolve("pushary-post-hook"),
@@ -103,6 +103,16 @@ var addPusharyHooks = (settings, binDir) => {
     }]
   });
   hooks.UserPromptSubmit = userPromptSubmit;
+  const notification = (Array.isArray(hooks.Notification) ? hooks.Notification : []).filter((entry) => !isPusharyHook(entry));
+  notification.push({
+    matcher: "permission_prompt|idle_prompt|agent_needs_input|agent_completed",
+    hooks: [{
+      type: "command",
+      command: resolve("pushary-notification-hook"),
+      timeout: 10
+    }]
+  });
+  hooks.Notification = notification;
 };
 var removePusharySettings = (settings) => {
   let changed = removeClaudeMcpServers(settings);
@@ -121,7 +131,7 @@ var removePusharySettings = (settings) => {
   }
   const hooks = asRecord(settings.hooks);
   if (hooks) {
-    for (const key of ["PreToolUse", "PostToolUse", "Stop", "UserPromptSubmit"]) {
+    for (const key of ["PreToolUse", "PostToolUse", "Stop", "UserPromptSubmit", "Notification"]) {
       const entries = hooks[key];
       if (!Array.isArray(entries)) continue;
       const filtered = entries.filter((entry) => !isPusharyHook(entry));

package/dist/{chunk-IAOXM7X5.js → chunk-P7B3U6DR.js}

@@ -752,6 +752,15 @@ var deriveUsage = (transcriptPath, sessionId) => {
     return void 0;
   }
 };
+var PENDING_COMMAND_PREFIX = "The user sent a new instruction from their phone via Pushary:";
+var mergeAdditionalContext = (existing, reported) => {
+  const pendingCommand = reported.status === "fulfilled" ? reported.value?.pendingCommand : void 0;
+  if (typeof pendingCommand !== "string" || pendingCommand.trim().length === 0) return existing;
+  const injected = `${PENDING_COMMAND_PREFIX} ${pendingCommand.trim()}`;
+  return existing ? `${existing}
+
+${injected}` : injected;
+};
 var detectInstallMode = () => (process.argv[1] ?? "").includes("_npx") ? "npx" : "cli";
 var reportEvent = async (event, options = {}) => {
   const apiKey = getApiKey();
@@ -766,7 +775,14 @@ var reportEvent = async (event, options = {}) => {
       body: JSON.stringify({
         ...event,
         machineId: event.machineId ?? getMachineId(),
-        installMode: detectInstallMode()
+        installMode: detectInstallMode(),
+        // 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.
+        canDrainCommand: event.agentType === CLAUDE_CODE_AGENT.type
       }),
       signal: AbortSignal.timeout(options.timeoutMs ?? 1e4)
     });
@@ -794,22 +810,21 @@ var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
     }
     const decisionSource = deriveDecisionSource(lookup.tool, lookup.input, liveMode);
     const beacon = decisionSource === "policy_auto" && throttlePass(`autodecision:${sessionKey}:${lookup.tool}`, AUTO_DECISION_WINDOW_MS) ? deriveAutoDecisionBeacon(lookup.tool, lookup.input, liveMode) : void 0;
-    const reports = [
-      reportEvent({
-        event: isError ? "tool_error" : "tool_complete",
-        agentType: agent.type,
-        agentName: `${agent.label} - ${projectName}`,
-        action,
-        sessionId: input.session_id,
-        error: isError ? String(input.tool_result?.error ?? input.tool_result?.stderr ?? "").slice(0, 500) : void 0,
-        decisionSource,
-        ...beacon ? { decisionOrigin: beacon.decisionOrigin, toolName: beacon.toolName, toolTarget: beacon.toolTarget } : {},
-        meta: receiptsEnabled ? deriveReceiptMeta(lookup.tool, lookup.input, input.tool_result, input.cwd ?? process.cwd()) : void 0,
-        usage: deriveUsage(input.transcript_path, input.session_id)
-      })
-    ];
+    const toolReport = reportEvent({
+      event: isError ? "tool_error" : "tool_complete",
+      agentType: agent.type,
+      agentName: `${agent.label} - ${projectName}`,
+      action,
+      sessionId: input.session_id,
+      error: isError ? String(input.tool_result?.error ?? input.tool_result?.stderr ?? "").slice(0, 500) : void 0,
+      decisionSource,
+      ...beacon ? { decisionOrigin: beacon.decisionOrigin, toolName: beacon.toolName, toolTarget: beacon.toolTarget } : {},
+      meta: receiptsEnabled ? deriveReceiptMeta(lookup.tool, lookup.input, input.tool_result, input.cwd ?? process.cwd()) : void 0,
+      usage: deriveUsage(input.transcript_path, input.session_id)
+    }, { maxAttempts: 1 });
+    const extraReports = [];
     if (throttlePass(`hookactive:${sessionKey}`, HOOK_ACTIVE_WINDOW_MS)) {
-      reports.push(
+      extraReports.push(
         reportEvent(
           {
             event: "agent_hook_active",
@@ -821,7 +836,10 @@ var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
         )
       );
     }
-    await Promise.allSettled(reports);
+    const [reported] = await Promise.allSettled([toolReport, ...extraReports]);
+    if (agent.type === CLAUDE_CODE_AGENT.type) {
+      additionalContext = mergeAdditionalContext(additionalContext, reported);
+    }
     return additionalContext;
   } catch {
     return void 0;
@@ -841,32 +859,47 @@ var handleUserPrompt = async (input, agent = CLAUDE_CODE_AGENT) => {
       additionalContext = buildLateAnswerContext(late);
       for (const l of late) removePendingQuestion(sessionKey, l.correlationId);
     }
-    await reportEvent({
-      event: "user_prompt",
-      agentType: agent.type,
-      agentName: `${agent.label} - ${projectName}`,
-      sessionId: input.session_id,
-      taskTitle
-    }, { maxAttempts: 1, timeoutMs: 800 });
+    const [reported] = await Promise.allSettled([
+      reportEvent({
+        event: "user_prompt",
+        agentType: agent.type,
+        agentName: `${agent.label} - ${projectName}`,
+        sessionId: input.session_id,
+        taskTitle
+      }, { maxAttempts: 1, timeoutMs: 800 })
+    ]);
+    if (agent.type === CLAUDE_CODE_AGENT.type) {
+      additionalContext = mergeAdditionalContext(additionalContext, reported);
+    }
     return additionalContext;
   } catch {
     return void 0;
   }
 };
+var STOP_SUMMARY_MAX_LENGTH = 200;
+var summarizeFinalMessage = (message) => {
+  if (typeof message !== "string") return "Session ended";
+  const collapsed = message.replace(/\s+/g, " ").trim();
+  if (!collapsed) return "Session ended";
+  return collapsed.slice(0, STOP_SUMMARY_MAX_LENGTH);
+};
 var handleStop = async (input, agent = CLAUDE_CODE_AGENT) => {
   try {
     const projectName = basename(input.cwd ?? process.cwd());
     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,
         agentName: `${agent.label} - ${projectName}`,
-        action: "Session ended",
+        action: summarizeFinalMessage(input.last_assistant_message),
         sessionId: input.session_id,
         usage: deriveUsage(input.transcript_path, input.session_id)
-      })
+      }, { maxAttempts: 1 })
     ];
     if (late.length > 0) {
       tasks.push(notifyLateAnswers(getApiKey(), late, `${agent.label} - ${projectName}`, input.session_id));
@@ -886,16 +919,40 @@ var handleStop = async (input, agent = CLAUDE_CODE_AGENT) => {
     return void 0;
   }
 };
-var handleNotification = async (input) => {
+var NOTIFICATION_PUSH_TYPES = /* @__PURE__ */ new Set(["idle_prompt", "agent_needs_input"]);
+var NOTIFICATION_THROTTLE_MS = 60 * 1e3;
+var handleNotification = async (input, agent = CLAUDE_CODE_AGENT) => {
   try {
     const projectName = basename(input.cwd ?? process.cwd());
+    const notifType = input.notification_type ?? input.type ?? "";
+    const sessionKey = input.session_id || DEFAULT_SESSION;
+    if (NOTIFICATION_PUSH_TYPES.has(notifType)) {
+      if (!throttlePass(`notify:${sessionKey}:${notifType}`, NOTIFICATION_THROTTLE_MS)) return;
+      let apiKey;
+      try {
+        apiKey = getApiKey();
+      } catch {
+        return;
+      }
+      const mode = await fetchModeState(apiKey, input.session_id).catch(() => null);
+      if (mode?.kill || mode?.mode === "terminal_only") return;
+      await sendNotification(apiKey, {
+        title: `${agent.label} is waiting`,
+        body: (input.message ?? "Your agent is waiting for you.").slice(0, 200),
+        agentName: `${agent.label} - ${projectName}`,
+        sessionId: input.session_id
+      }, 4e3).catch(() => {
+      });
+      return;
+    }
     await reportEvent({
-      event: input.type === "error" ? "error" : "notification",
-      agentType: "claude_code",
-      agentName: `Claude Code - ${projectName}`,
-      action: input.title ?? input.message ?? "Notification",
+      event: notifType === "error" ? "error" : "notification",
+      agentType: agent.type,
+      agentName: `${agent.label} - ${projectName}`,
+      action: input.message ?? input.title ?? "Notification",
       sessionId: input.session_id,
-      error: input.type === "error" ? input.message : void 0
+      error: notifType === "error" ? input.message ?? input.title : void 0
+    }).catch(() => {
     });
   } catch {
   }

package/dist/{chunk-WUNVKFFY.js → chunk-SVVEC4QV.js}

@@ -251,6 +251,7 @@ You have Pushary MCP tools that reach the user on their phone. Use them proactiv
 - When you are blocked, stuck, or hit an error you cannot resolve on your own, call \`send_notification\` so the user knows, and call \`ask_user\` if you need a decision to continue.
 - When a task that took several steps finishes, call \`send_notification\` so the user knows it is done.
 - Use \`cancel_question\` to retract a pending question once it is no longer needed.
+- Respect the user's Pushary delivery mode: it decides where an approval is surfaced (phone, terminal, or awareness only), not whether it is required. In Terminal mode do not expect a phone answer; the approval waits in the terminal. If the Pushary hook already gated an action, a single approval is enough, do not ask again.
 
 Pass \`agentName\` as "${label} - <project folder name>" so the user knows which session is asking. If a question times out with no answer, retry once with a longer timeout before falling back to asking in the terminal.`;
 var renderAgentInstructions = (label) => instructionBody(label);

package/dist/src/index.d.ts

@@ -7,6 +7,7 @@ interface ToolInput {
     session_id?: string;
     cwd?: string;
     transcript_path?: string;
+    permission_mode?: string;
 }
 interface HookOutput {
     hookSpecificOutput: {
@@ -90,14 +91,16 @@ declare const handleStop: (input: {
     session_id?: string;
     stop_hook_active?: boolean;
     transcript_path?: string;
+    last_assistant_message?: string;
 }, agent?: AgentIdentity) => Promise<StopHookOutput | undefined>;
 declare const handleNotification: (input: {
     message?: string;
     title?: string;
     type?: string;
+    notification_type?: string;
     cwd?: string;
     session_id?: string;
-}) => Promise<void>;
+}, agent?: AgentIdentity) => Promise<void>;
 
 interface AskUserParams {
     question: string;

package/dist/src/index.js

@@ -1,8 +1,7 @@
 import {
   handlePreToolUse
-} from "../chunk-CY5YP34L.js";
+} from "../chunk-2AMV2BDM.js";
 import "../chunk-KQYIHZ5E.js";
-import "../chunk-R5AJNXZS.js";
 import {
   askUser,
   cancelQuestion,
@@ -15,7 +14,8 @@ import {
   reportEvent,
   resolvePolicy,
   waitForAnswer
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-P7B3U6DR.js";
+import "../chunk-R5AJNXZS.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-Z5PL3K7C.js";
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushary/agent-hooks",
-  "version": "0.31.0",
+  "version": "0.32.2",
   "description": "Permission hooks for AI coding agents: route tool approvals through Pushary push notifications",
   "keywords": [
     "pushary",
@@ -47,6 +47,8 @@
     "pushary-post-hook": "./dist/bin/pushary-post-hook.js",
     "pushary-stop-hook": "./dist/bin/pushary-stop-hook.js",
     "pushary-prompt-hook": "./dist/bin/pushary-prompt-hook.js",
+    "pushary-notification-hook": "./dist/bin/pushary-notification-hook.js",
+    "pushary-claude": "./dist/bin/pushary-claude.js",
     "pushary-codex": "./dist/bin/pushary-codex.js",
     "pushary-codex-hook": "./dist/bin/pushary-codex-hook.js",
     "pushary-gemini-hook": "./dist/bin/pushary-gemini-hook.js",
@@ -65,7 +67,7 @@
   "scripts": {
     "build": "node scripts/bundle-plugin.mjs && tsup",
     "dev": "tsup --watch",
-    "test": "bun test src/api.test.ts && bun test src/claude-config.test.ts && bun test src/config.test.ts && bun test src/mcp-http.test.ts && bun test src/retry.test.ts && bun test src/usage.test.ts && bun test src/validate.test.ts && bun test src/policy.test.ts && bun test src/npm.test.ts && bun test src/identity.test.ts && bun test src/pending.test.ts && bun test src/events.test.ts && bun test src/describe.test.ts && bun test src/suggestions.test.ts && bun test src/safe-commands.test.ts && bun test src/hook.test.ts && bun test src/codex-adapter.test.ts && bun test src/codex-config.test.ts && bun test src/gemini-adapter.test.ts && bun test src/gemini-config.test.ts && bun test src/instruction-file.test.ts && bun test src/pairing.test.ts && bun test src/wait-ladder.test.ts && bun test src/ledger.test.ts"
+    "test": "bun test src/api.test.ts && bun test src/claude-config.test.ts && bun test src/config.test.ts && bun test src/mcp-http.test.ts && bun test src/retry.test.ts && bun test src/usage.test.ts && bun test src/validate.test.ts && bun test src/policy.test.ts && bun test src/npm.test.ts && bun test src/identity.test.ts && bun test src/pending.test.ts && bun test src/events.test.ts && bun test src/describe.test.ts && bun test src/suggestions.test.ts && bun test src/safe-commands.test.ts && bun test src/hook.test.ts && bun test src/codex-adapter.test.ts && bun test src/codex-config.test.ts && bun test src/gemini-adapter.test.ts && bun test src/gemini-config.test.ts && bun test src/instruction-file.test.ts && bun test src/pairing.test.ts && bun test src/wait-ladder.test.ts && bun test src/ledger.test.ts && bun test src/wrapper/wrapper.test.ts"
   },
   "dependencies": {
     "@inquirer/prompts": "^8.4.2",