@pushary/agent-hooks 0.30.0 → 0.32.1

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-clean.js

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

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

@@ -36,7 +36,7 @@ import {
   toCodexWire,
   toPolicyLookup,
   waitForAnswer
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-USRIQPWI.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-USRIQPWI.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-XY6OKUQ4.js";
+} from "../chunk-SVVEC4QV.js";
 import {
   execNpm
 } from "../chunk-J7JWI3KU.js";

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

@@ -28,7 +28,7 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-USRIQPWI.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-FD4NV6BO.js";
 import "../chunk-KQYIHZ5E.js";
 import "../chunk-R5AJNXZS.js";
-import "../chunk-IAOXM7X5.js";
+import "../chunk-USRIQPWI.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-USRIQPWI.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-USRIQPWI.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-USRIQPWI.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-XY6OKUQ4.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-USRIQPWI.js";
 import "../chunk-DWED7BS3.js";
 import {
   isValidApiKey
@@ -35,7 +35,7 @@ import "../chunk-NKXSILEW.js";
 import { existsSync, readFileSync, writeFileSync, appendFileSync, mkdirSync, cpSync, rmSync, chmodSync } from "fs";
 import { join, dirname, basename } from "path";
 import { homedir } from "os";
-import { execSync } from "child_process";
+import { execSync as execSync2 } from "child_process";
 import { checkbox, input, confirm } from "@inquirer/prompts";
 import { fileURLToPath } from "url";
 import { parse as parseTOML, stringify as stringifyTOML } from "smol-toml";
@@ -309,6 +309,20 @@ var connectViaAppPairing = async () => {
   }
 };
 
+// src/skills-cli.ts
+import { execSync } from "child_process";
+var installSkillViaSkillsCli = (agent) => {
+  try {
+    execSync(`npx -y skills@latest add Pushary/pushary-skill@pushary -y -g --agent ${agent}`, {
+      stdio: "pipe",
+      timeout: 9e4
+    });
+    return true;
+  } catch {
+    return false;
+  }
+};
+
 // bin/pushary-setup.ts
 var CLAUDE_SETTINGS = join(homedir(), ".claude", "settings.json");
 var CLAUDE_JSON = join(homedir(), ".claude.json");
@@ -352,7 +366,7 @@ var parseConnectFlag = () => {
 var isInstalled = (command) => {
   const whichCmd = process.platform === "win32" ? "where" : "which";
   try {
-    execSync(`${whichCmd} ${command}`, { stdio: "ignore", timeout: 5e3 });
+    execSync2(`${whichCmd} ${command}`, { stdio: "ignore", timeout: 5e3 });
     return true;
   } catch {
     return false;
@@ -444,11 +458,13 @@ var fetchSkillContent = async () => {
   _cachedSkillContent = readFileSync(source, "utf-8");
   return _cachedSkillContent;
 };
-var installSkillToDir = async (dir, label) => {
-  await spinner(label, async () => {
+var skillsCliInUse = () => isInstalled("skills") || existsSync(join(homedir(), ".agents", "skills"));
+var installSkill = async (agent, fallbackDir) => {
+  await spinner("Installing Pushary skill", async () => {
+    if (skillsCliInUse() && installSkillViaSkillsCli(agent)) return;
     const content = await fetchSkillContent();
-    if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-    writeFileSync(join(dir, "SKILL.md"), content, "utf-8");
+    if (!existsSync(fallbackDir)) mkdirSync(fallbackDir, { recursive: true });
+    writeFileSync(join(fallbackDir, "SKILL.md"), content, "utf-8");
   });
 };
 var setupClaudeCode = async (apiKey) => {
@@ -471,7 +487,7 @@ var setupClaudeCode = async (apiKey) => {
   await spinner(`Writing ${CLAUDE_SETTINGS}`, async () => {
     writeJson(CLAUDE_SETTINGS, settings);
   });
-  await installSkillToDir(CLAUDE_SKILL_DIR, "Installing Pushary skill");
+  await installSkill("claude-code", CLAUDE_SKILL_DIR);
   console.log();
   console.log(`  ${dim2("What this configured:")}`);
   console.log(`  ${dim2("\u2022")} MCP server: your agent can send notifications and ask questions`);
@@ -481,7 +497,7 @@ var setupClaudeCode = async (apiKey) => {
 };
 var resolveHermesPython = () => {
   try {
-    const launcher = execSync("command -v hermes", { encoding: "utf-8", stdio: "pipe", timeout: 5e3 }).trim();
+    const launcher = execSync2("command -v hermes", { encoding: "utf-8", stdio: "pipe", timeout: 5e3 }).trim();
     if (launcher) {
       const shebang = readFileSync(launcher, "utf-8").split("\n", 1)[0];
       if (shebang.startsWith("#!")) {
@@ -497,23 +513,23 @@ var resolveHermesPython = () => {
 };
 var ensurePip = (python) => {
   try {
-    execSync(`"${python}" -m pip --version`, { stdio: "ignore", timeout: 15e3 });
+    execSync2(`"${python}" -m pip --version`, { stdio: "ignore", timeout: 15e3 });
     return;
   } catch {
   }
   try {
-    execSync(`"${python}" -m ensurepip --upgrade`, { stdio: "pipe", timeout: 6e4 });
+    execSync2(`"${python}" -m ensurepip --upgrade`, { stdio: "pipe", timeout: 6e4 });
   } catch {
   }
 };
 var enablePusharyPlugin = (python) => {
   const snippet = 'from hermes_cli.config import load_config, save_config; c = load_config(); p = c.get("plugins") if isinstance(c.get("plugins"), dict) else {}; e = p.get("enabled") if isinstance(p.get("enabled"), list) else []; p["enabled"] = (e + ["pushary"]) if "pushary" not in e else e; c["plugins"] = p; a = c.get("agent") if isinstance(c.get("agent"), dict) else {}; d = a.get("disabled_toolsets") if isinstance(a.get("disabled_toolsets"), list) else []; a["disabled_toolsets"] = (d + ["clarify"]) if "clarify" not in d else d; c["agent"] = a; save_config(c)';
   try {
-    execSync(`"${python}" -c '${snippet}'`, { stdio: "pipe", timeout: 15e3 });
+    execSync2(`"${python}" -c '${snippet}'`, { stdio: "pipe", timeout: 15e3 });
     return;
   } catch {
   }
-  execSync("hermes plugins enable pushary", { stdio: "ignore", timeout: 1e4 });
+  execSync2("hermes plugins enable pushary", { stdio: "ignore", timeout: 1e4 });
 };
 var setupHermes = async (_apiKey) => {
   console.log(`
@@ -532,7 +548,7 @@ var setupHermes = async (_apiKey) => {
   }
   await spinner("Installing hermes-plugin-pushary into Hermes\u2019 environment", async () => {
     ensurePip(python);
-    execSync(`"${python}" -m pip install --upgrade hermes-plugin-pushary`, { stdio: "pipe", timeout: 18e4 });
+    execSync2(`"${python}" -m pip install --upgrade hermes-plugin-pushary`, { stdio: "pipe", timeout: 18e4 });
   });
   await spinner("Enabling plugin + routing questions to push", async () => {
     enablePusharyPlugin(python);
@@ -561,7 +577,7 @@ var compareCodexVersion = (a, b) => {
 };
 var readCodexVersion = () => {
   try {
-    return parseCodexVersion(execSync("codex --version", { encoding: "utf-8", stdio: "pipe", timeout: 1e4 }));
+    return parseCodexVersion(execSync2("codex --version", { encoding: "utf-8", stdio: "pipe", timeout: 1e4 }));
   } catch {
     return null;
   }
@@ -658,7 +674,7 @@ var setupCodex = async (apiKey) => {
       addCodexNotifyEntry(codexConfig);
     });
   }
-  await installSkillToDir(CODEX_SKILL_DIR, "Installing Pushary skill");
+  await installSkill("codex", CODEX_SKILL_DIR);
   await spinner("Teaching Codex to ask via push (~/.codex/AGENTS.md)", async () => {
     writeInstructionBlock(CODEX_AGENTS_MD, renderAgentInstructions("Codex"));
   });

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

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

package/dist/{chunk-CY5YP34L.js → chunk-FD4NV6BO.js}

@@ -24,7 +24,7 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "./chunk-IAOXM7X5.js";
+} from "./chunk-USRIQPWI.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-XY6OKUQ4.js → chunk-SVVEC4QV.js}

@@ -251,10 +251,11 @@ 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);
-var KEYLESS_FALLBACK_LINE = "This repo is set up with Pushary phone approvals. No PUSHARY_API_KEY found for you, so remote notifications are off; questions will fall back to the terminal. Setup: https://pushary.com/docs?utm_source=agents-md&utm_medium=keyless-fallback";
+var KEYLESS_FALLBACK_LINE = "This repo uses Pushary phone approvals. Your teammates get agent questions on their lock screens; you do not have a key yet, so questions will fall back to the terminal. Get your own key (7-day trial): https://pushary.com/sign-up?utm_source=agents-md&utm_medium=teammate";
 var renderProjectAgentInstructions = (label) => `${instructionBody(label)}
 
 If this environment has no Pushary API key (no PUSHARY_API_KEY and no key in ~/.pushary/config.json), the tools above are unavailable in this session. In that case, treat the following as a statement of fact about this session and continue in the terminal: ${KEYLESS_FALLBACK_LINE}`;

package/dist/{chunk-IAOXM7X5.js → chunk-USRIQPWI.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,13 +859,18 @@ 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;
@@ -859,6 +882,9 @@ 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,
@@ -866,7 +892,7 @@ var handleStop = async (input, agent = CLAUDE_CODE_AGENT) => {
         action: "Session ended",
         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 +912,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/src/index.d.ts

@@ -7,6 +7,7 @@ interface ToolInput {
     session_id?: string;
     cwd?: string;
     transcript_path?: string;
+    permission_mode?: string;
 }
 interface HookOutput {
     hookSpecificOutput: {
@@ -95,9 +96,10 @@ 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,6 +1,6 @@
 import {
   handlePreToolUse
-} from "../chunk-CY5YP34L.js";
+} from "../chunk-FD4NV6BO.js";
 import "../chunk-KQYIHZ5E.js";
 import "../chunk-R5AJNXZS.js";
 import {
@@ -15,7 +15,7 @@ import {
   reportEvent,
   resolvePolicy,
   waitForAnswer
-} from "../chunk-IAOXM7X5.js";
+} from "../chunk-USRIQPWI.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-Z5PL3K7C.js";
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushary/agent-hooks",
-  "version": "0.30.0",
+  "version": "0.32.1",
   "description": "Permission hooks for AI coding agents: route tool approvals through Pushary push notifications",
   "keywords": [
     "pushary",
@@ -47,6 +47,7 @@
     "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-codex": "./dist/bin/pushary-codex.js",
     "pushary-codex-hook": "./dist/bin/pushary-codex-hook.js",
     "pushary-gemini-hook": "./dist/bin/pushary-gemini-hook.js",