@pushary/agent-hooks 0.20.0 → 0.21.1

package/dist/bin/pushary-clean.js

@@ -8,7 +8,7 @@ import {
   removeCodexHooks,
   removeGeminiSettings,
   removeInstructionBlock
-} from "../chunk-UIBTFZUD.js";
+} from "../chunk-BHAMEPOP.js";
 
 // bin/pushary-clean.ts
 import { existsSync, readFileSync, writeFileSync, rmSync } from "fs";

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

@@ -1,9 +1,13 @@
 #!/usr/bin/env node
+import {
+  denyReasonFrom
+} from "../chunk-N7VXDBQU.js";
 import {
   CODEX_AGENT,
   codexAllow,
   codexDeny,
   codexPass,
+  describeApplyPatch,
   handlePostToolUse,
   handleStop,
   handleUserPrompt,
@@ -12,7 +16,7 @@ import {
   reportEvent,
   toCodexWire,
   toPolicyLookup
-} from "../chunk-QY4L6XHN.js";
+} from "../chunk-BYNYYZWW.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -25,7 +29,7 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "../chunk-ACE77TKQ.js";
+} from "../chunk-6QWFMVCD.js";
 import "../chunk-USUCPCUC.js";
 import "../chunk-DWED7BS3.js";
 import {
@@ -38,6 +42,7 @@ import { tmpdir, userInfo } from "os";
 import { existsSync, mkdirSync, statSync, unlinkSync, writeFileSync } from "fs";
 var KILL_REASON = "Stopped by user: this agent was halted from Pushary";
 var MAX_WAIT_SECONDS = 170;
+var START_MS = Date.now();
 var APPROVAL_TTL_MS = 10 * 60 * 1e3;
 var sanitizeId = (value) => value.replace(/[^A-Za-z0-9_-]/g, "_").slice(0, 128);
 var userScope = () => {
@@ -69,6 +74,19 @@ var consumeApproval = (toolUseId) => {
     return false;
   }
 };
+var NOTIFY_TTL_MS = 60 * 1e3;
+var claimNotify = (toolUseId) => {
+  if (!toolUseId) return true;
+  const path = join(APPROVAL_DIR, `notify-${sanitizeId(toolUseId)}`);
+  try {
+    if (existsSync(path) && Date.now() - statSync(path).mtimeMs < NOTIFY_TTL_MS) return false;
+    if (!existsSync(APPROVAL_DIR)) mkdirSync(APPROVAL_DIR, { recursive: true, mode: 448 });
+    writeFileSync(path, "", { encoding: "utf-8", mode: 384 });
+    return true;
+  } catch {
+    return true;
+  }
+};
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var pollForAnswer = async (apiKey, correlationId, deadlineMs, pollInterval = 2e3) => {
   while (Date.now() < deadlineMs) {
@@ -88,11 +106,10 @@ var pollForAnswer = async (apiKey, correlationId, deadlineMs, pollInterval = 2e3
   return { answered: false };
 };
 var agentNameFor = (input) => `Codex - ${basename(input.cwd ?? process.cwd())}`;
-var pushQuestion = async (apiKey, input, waitSeconds) => {
-  const toolName = input.tool_name ?? "";
-  const toolInput = input.tool_input ?? {};
+var describeFor = (input, lookup) => input.tool_name === "apply_patch" ? describeApplyPatch(input.tool_input?.command) ?? describeToolCall(lookup.tool, lookup.input, "hook") : describeToolCall(lookup.tool, lookup.input, "hook");
+var pushQuestion = async (apiKey, input, lookup, waitSeconds) => {
   const projectName = basename(input.cwd ?? process.cwd());
-  const description = describeToolCall(toolName, toolInput, "hook");
+  const description = describeFor(input, lookup);
   const result = await askUser(apiKey, {
     question: `Allow ${description}?`,
     type: "confirm",
@@ -100,18 +117,21 @@ var pushQuestion = async (apiKey, input, waitSeconds) => {
     agentName: agentNameFor(input),
     sessionId: input.session_id,
     machineId: getMachineId(),
-    toolName,
-    toolTarget: deriveToolTarget(toolName, toolInput)
+    toolName: lookup.tool,
+    toolTarget: deriveToolTarget(lookup.tool, lookup.input)
   });
-  const deadline = Date.now() + Math.min(waitSeconds, MAX_WAIT_SECONDS) * 1e3;
+  const deadline = Math.min(
+    Date.now() + Math.min(waitSeconds, MAX_WAIT_SECONDS) * 1e3,
+    START_MS + MAX_WAIT_SECONDS * 1e3
+  );
   const answer = await pollForAnswer(apiKey, result.correlationId, deadline);
   return { answer, correlationId: result.correlationId };
 };
-var notifyApprovalNeeded = async (apiKey, input) => {
+var notifyApprovalNeeded = async (apiKey, input, lookup) => {
   try {
     await sendNotification(apiKey, {
       title: "Agent needs approval",
-      body: describeToolCall(input.tool_name ?? "", input.tool_input ?? {}, "hook"),
+      body: describeFor(input, lookup),
       agentName: agentNameFor(input),
       sessionId: input.session_id,
       machineId: getMachineId()
@@ -124,7 +144,7 @@ var decidePermissionRequest = async (input) => {
     const apiKey = getApiKey();
     const modeState = await fetchModeState(apiKey, input.session_id);
     if (modeState.kill) return codexDeny(KILL_REASON);
-    const lookup = toPolicyLookup(input.tool_name ?? "", input.tool_input ?? {});
+    const lookup = toPolicyLookup(input.tool_name ?? "", input.tool_input ?? {}, input.cwd);
     const policy = await getPolicy(apiKey, modeState.policyVersion);
     const toolPolicy = resolvePolicy(policy, lookup.tool, modeState.mode, lookup.input);
     if (toolPolicy.timeoutSeconds === 0 && toolPolicy.timeoutAction === "approve") return codexAllow();
@@ -133,17 +153,17 @@ var decidePermissionRequest = async (input) => {
     }
     if (toolPolicy.mode === "terminal_only") return codexPass();
     if (toolPolicy.mode === "notify_only") {
-      await notifyApprovalNeeded(apiKey, input);
+      if (claimNotify(input.tool_use_id)) await notifyApprovalNeeded(apiKey, input, lookup);
       return codexPass();
     }
     const waitSeconds = toolPolicy.mode === "push_first" ? toolPolicy.pushFirstSeconds : toolPolicy.timeoutSeconds;
-    const { answer, correlationId } = await pushQuestion(apiKey, input, waitSeconds);
+    const { answer, correlationId } = await pushQuestion(apiKey, input, lookup, waitSeconds);
     if (answer.answered) {
       if (answer.value === "yes") {
         if (toolPolicy.mode === "push_only") markApproved(input.tool_use_id);
         return codexAllow();
       }
-      return codexDeny("Denied via push notification");
+      return codexDeny(denyReasonFrom(answer.value));
     }
     savePendingQuestion(input.session_id || DEFAULT_SESSION, correlationId);
     if (toolPolicy.mode === "push_first") return codexPass();
@@ -159,7 +179,7 @@ var decidePreToolUse = async (input) => {
     const apiKey = getApiKey();
     const modeState = await fetchModeState(apiKey, input.session_id);
     if (modeState.kill) return codexDeny(KILL_REASON);
-    const lookup = toPolicyLookup(input.tool_name ?? "", input.tool_input ?? {});
+    const lookup = toPolicyLookup(input.tool_name ?? "", input.tool_input ?? {}, input.cwd);
     const policy = await getPolicy(apiKey, modeState.policyVersion);
     const toolPolicy = resolvePolicy(policy, lookup.tool, modeState.mode, lookup.input);
     if (toolPolicy.timeoutSeconds === 0 && toolPolicy.timeoutAction === "approve") return codexPass();
@@ -170,19 +190,19 @@ var decidePreToolUse = async (input) => {
       if (consumeApproval(input.tool_use_id)) return codexPass();
       let pushed;
       try {
-        pushed = await pushQuestion(apiKey, input, toolPolicy.timeoutSeconds);
+        pushed = await pushQuestion(apiKey, input, lookup, toolPolicy.timeoutSeconds);
       } catch {
         return preToolUseTimeoutDecision(toolPolicy.timeoutAction, "Push notification failed, denying per policy");
       }
       const { answer, correlationId } = pushed;
       if (answer.answered) {
-        return answer.value === "yes" ? codexPass() : codexDeny("Denied via push notification");
+        return answer.value === "yes" ? codexPass() : codexDeny(denyReasonFrom(answer.value));
       }
       savePendingQuestion(input.session_id || DEFAULT_SESSION, correlationId);
       return preToolUseTimeoutDecision(toolPolicy.timeoutAction);
     }
     if (toolPolicy.mode === "notify_only") {
-      await notifyApprovalNeeded(apiKey, input);
+      if (claimNotify(input.tool_use_id)) await notifyApprovalNeeded(apiKey, input, lookup);
       return codexPass();
     }
     return codexPass();
@@ -228,15 +248,17 @@ var main = async () => {
       case "PreToolUse":
         emit(toCodexWire("PreToolUse", await decidePreToolUse(input)));
         break;
-      case "PostToolUse":
+      case "PostToolUse": {
+        const lookup = toPolicyLookup(input.tool_name ?? "", input.tool_input ?? {}, input.cwd);
         await handlePostToolUse({
-          tool_name: input.tool_name ?? "",
-          tool_input: input.tool_input ?? {},
+          tool_name: lookup.tool,
+          tool_input: lookup.input,
           tool_result: asToolResult(input.tool_response),
           cwd: input.cwd,
           session_id: input.session_id
         }, CODEX_AGENT);
         break;
+      }
       case "UserPromptSubmit":
         await handleUserPrompt({
           prompt: input.prompt,

package/dist/bin/pushary-codex.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 import {
   reportEvent
-} from "../chunk-QY4L6XHN.js";
+} from "../chunk-BYNYYZWW.js";
 import {
   askUser,
   getMachineId,
   waitForAnswer
-} from "../chunk-ACE77TKQ.js";
+} from "../chunk-6QWFMVCD.js";
 import "../chunk-USUCPCUC.js";
 import "../chunk-DWED7BS3.js";
 import {

package/dist/bin/pushary-doctor.js

@@ -6,8 +6,9 @@ import {
   hasGeminiHooks,
   hasInstructionBlock,
   missingCodexHookEvents,
-  missingGeminiHookEvents
-} from "../chunk-UIBTFZUD.js";
+  missingGeminiHookEvents,
+  untrustedCodexHookEvents
+} from "../chunk-BHAMEPOP.js";
 import {
   callMcpTool,
   sendMcpRequest
@@ -62,6 +63,20 @@ var extractHookCommand = (entries, needle) => {
   }
   return null;
 };
+var extractHookTimeout = (entries, needle) => {
+  if (!Array.isArray(entries)) return null;
+  for (const entry of entries) {
+    const hookList = entry.hooks;
+    if (!Array.isArray(hookList)) continue;
+    for (const candidate of hookList) {
+      const hook = candidate;
+      if (typeof hook.command === "string" && hook.command.includes(needle) && typeof hook.timeout === "number") {
+        return hook.timeout;
+      }
+    }
+  }
+  return null;
+};
 var results = [];
 var check = (passed, label, detail) => {
   results.push({ passed, label, detail });
@@ -149,15 +164,30 @@ var main = async () => {
   const codexHooksJson = readJson(codexHooksPath);
   if (existsSync(codexConfigPath) || codexHooksJson) {
     const codexConfig = existsSync(codexConfigPath) ? readFileSync(codexConfigPath, "utf-8") : "";
-    const hasPusharyMcp = codexConfig.includes("[mcp_servers.pushary]");
-    check(hasPusharyMcp, "Codex: MCP server configured");
-    if (hasPusharyMcp) {
-      const hasAutoApprove = codexConfig.includes('default_tools_approval_mode = "approve"');
-      check(hasAutoApprove, "Codex: tools auto-allowed", hasAutoApprove ? 'default_tools_approval_mode = "approve"' : "missing \u2014 MCP calls will prompt for approval");
-      const hasPerToolOverrides = /\[mcp_servers\.pushary\.tools\./.test(codexConfig);
-      if (hasPerToolOverrides) {
+    let codexParsed = {};
+    try {
+      codexParsed = parseTOML(codexConfig);
+    } catch {
+    }
+    const codexMcp = codexParsed.mcp_servers?.pushary;
+    const codexTransport = !!codexMcp && (typeof codexMcp.url === "string" || typeof codexMcp.command === "string");
+    const codexEnvVar = codexMcp && typeof codexMcp.bearer_token_env_var === "string" ? codexMcp.bearer_token_env_var : void 0;
+    const codexHasCred = !!codexEnvVar || !!codexMcp && typeof codexMcp.bearer_token === "string";
+    const codexMcpOk = !!codexMcp && codexTransport && codexHasCred;
+    check(codexMcpOk, "Codex: MCP server configured", codexMcpOk ? void 0 : !codexMcp ? "no [mcp_servers.pushary] \u2014 re-run setup" : !codexTransport ? "entry has no url \u2014 `codex mcp add` likely failed, re-run setup" : "entry has no bearer_token/_env_var \u2014 re-run setup");
+    if (codexMcp) {
+      const hasAutoApprove = codexMcp.default_tools_approval_mode === "approve";
+      check(hasAutoApprove, "Codex: tools auto-allowed", hasAutoApprove ? "default_tools_approval_mode = approve" : "missing \u2014 MCP calls will prompt for approval");
+      if (codexMcp.tools && typeof codexMcp.tools === "object") {
         console.log(`  ${warn} Codex: per-tool approval overrides detected ${dim("(redundant with default_tools_approval_mode)")}`);
       }
+      if (codexEnvVar) {
+        const envValue = process.env[codexEnvVar]?.trim();
+        check(!!envValue, `Codex: MCP key available in shell ($${codexEnvVar})`, envValue ? "set" : `not set \u2014 Codex reads its key from your shell; the ~/.pushary/config.json fallback only covers hooks. Add the export to your profile or re-run setup`);
+        if (envValue && apiKey && envValue !== apiKey) {
+          console.log(`  ${warn} Codex: $${codexEnvVar} differs from your active key ${dim("(rotate or re-run setup so hooks and MCP match)")}`);
+        }
+      }
     }
     const codexNotifyPath = codexConfig.match(/["']([^"']*pushary-codex[^"']*)["']/)?.[1] ?? null;
     const hooksInstalled = !!codexHooksJson && hasCodexHooks(codexHooksJson);
@@ -169,18 +199,16 @@ var main = async () => {
         const resolves = commandResolves(hookCommand);
         check(resolves, "Codex: hook command resolves", resolves ? hookCommand : `not on PATH: ${hookCommand}`);
       }
-      let hooksFeatureDisabled = false;
-      try {
-        const parsed = parseTOML(codexConfig);
-        const features = parsed.features;
-        hooksFeatureDisabled = !!features && typeof features === "object" && features.hooks === false;
-      } catch {
-      }
+      const features = codexParsed.features;
+      const hooksFeatureDisabled = !!features && typeof features === "object" && features.hooks === false;
       check(!hooksFeatureDisabled, "Codex: hooks feature enabled", hooksFeatureDisabled ? "[features].hooks = false in config.toml" : void 0);
       if (codexNotifyPath) {
         console.log(`  ${warn} Codex: stale legacy notify entry ${dim("(double-push risk, re-run setup to remove it)")}`);
       }
-      console.log(`  ${warn} Codex: trust the hooks inside Codex ${dim("(type /hooks in Codex and trust them, once; cannot be checked from here)")}`);
+      if (hookCommand) {
+        const untrusted = untrustedCodexHookEvents(codexParsed, codexHooksPath, hookCommand);
+        check(untrusted.length === 0, "Codex: hooks trusted", untrusted.length === 0 ? "all events trusted" : `untrusted (${untrusted.join(", ")}) \u2014 type /hooks in Codex and trust them, once`);
+      }
     } else {
       check(!!codexNotifyPath, "Codex: notify handler configured (deprecated)", codexNotifyPath ? "upgrade Codex and re-run setup for native hooks" : "missing, re-run setup");
       if (codexNotifyPath) {
@@ -203,17 +231,32 @@ var main = async () => {
     if (geminiPushary) {
       check(typeof geminiPushary.httpUrl === "string", "Gemini CLI: MCP transport", geminiPushary.httpUrl ? String(geminiPushary.httpUrl) : "missing \u2014 add httpUrl");
       check(geminiPushary.trust === true, "Gemini CLI: tools auto-allowed", geminiPushary.trust === true ? "trust: true" : "missing \u2014 MCP calls will prompt for confirmation");
+      const geminiAuth = geminiPushary.headers?.Authorization;
+      if (typeof geminiAuth === "string") {
+        if (geminiAuth.includes("${PUSHARY_API_KEY}")) {
+          check(false, "Gemini CLI: API key embedded", "header has an unexpanded ${PUSHARY_API_KEY} \u2014 re-run setup to embed the key");
+        } else if (apiKey && geminiAuth !== `Bearer ${apiKey}`) {
+          check(false, "Gemini CLI: API key matches active key", "embedded key differs from your active key (rotated?) \u2014 re-run setup");
+        } else {
+          check(true, "Gemini CLI: API key embedded");
+        }
+      }
     }
     const geminiHooksInstalled = hasGeminiHooks(geminiSettings);
     if (geminiHooksInstalled) {
       const missingEvents = missingGeminiHookEvents(geminiSettings);
       check(missingEvents.length === 0, "Gemini CLI: native hooks installed", missingEvents.length === 0 ? "all 5 events" : `missing ${missingEvents.join(", ")}, re-run setup`);
       const geminiHooks = geminiSettings.hooks;
-      const hookCommand = extractHookCommand(geminiHooks?.BeforeTool, GEMINI_HOOK_BINARY);
+      const hookCommand = extractHookCommand(geminiHooks?.BeforeTool, GEMINI_HOOK_BINARY) ?? extractHookCommand(geminiHooks?.AfterTool, GEMINI_HOOK_BINARY) ?? extractHookCommand(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);
+      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`);
+      }
     } else {
       check(false, "Gemini CLI: native hooks installed", "no Pushary hooks in ~/.gemini/settings.json \u2014 re-run setup");
     }

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

@@ -1,10 +1,13 @@
 #!/usr/bin/env node
+import {
+  denyReasonFrom
+} from "../chunk-N7VXDBQU.js";
 import {
   handlePostToolUse,
   handleStop,
   handleUserPrompt,
   reportEvent
-} from "../chunk-QY4L6XHN.js";
+} from "../chunk-BYNYYZWW.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -17,7 +20,7 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "../chunk-ACE77TKQ.js";
+} from "../chunk-6QWFMVCD.js";
 import "../chunk-USUCPCUC.js";
 import "../chunk-DWED7BS3.js";
 import {
@@ -63,8 +66,8 @@ var geminiTimeoutDecision = (timeoutAction, denyReason = "No response within tim
 // bin/pushary-gemini-hook.ts
 var KILL_REASON = "Stopped by user: this agent was halted from Pushary";
 var MAX_WAIT_SECONDS = 170;
+var START_MS = Date.now();
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-var denyReasonFrom = (value) => value && value !== "no" && value !== "yes" ? `Denied from your phone: ${value}` : "Denied via push notification";
 var pollForAnswer = async (apiKey, correlationId, deadlineMs, pollInterval = 2e3) => {
   while (Date.now() < deadlineMs) {
     const remaining = Math.min(Math.max(deadlineMs - Date.now(), 1e3), 3e4);
@@ -96,7 +99,10 @@ var pushQuestion = async (apiKey, input, lookup, waitSeconds, pollInterval = 2e3
     toolName: lookup.tool,
     toolTarget: deriveToolTarget(lookup.tool, lookup.input)
   });
-  const deadline = Date.now() + Math.min(waitSeconds, MAX_WAIT_SECONDS) * 1e3;
+  const deadline = Math.min(
+    Date.now() + Math.min(waitSeconds, MAX_WAIT_SECONDS) * 1e3,
+    START_MS + MAX_WAIT_SECONDS * 1e3
+  );
   const answer = await pollForAnswer(apiKey, result.correlationId, deadline, pollInterval);
   return { answer, correlationId: result.correlationId };
 };

package/dist/bin/pushary-hook.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 import {
   handlePreToolUse
-} from "../chunk-SDREQWNI.js";
-import "../chunk-ACE77TKQ.js";
+} from "../chunk-M5F2L4KF.js";
+import "../chunk-N7VXDBQU.js";
+import "../chunk-6QWFMVCD.js";
 import "../chunk-USUCPCUC.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-NKXSILEW.js";

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

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   handlePostToolUse
-} from "../chunk-QY4L6XHN.js";
-import "../chunk-ACE77TKQ.js";
+} from "../chunk-BYNYYZWW.js";
+import "../chunk-6QWFMVCD.js";
 import "../chunk-USUCPCUC.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-NKXSILEW.js";

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

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   handleUserPrompt
-} from "../chunk-QY4L6XHN.js";
-import "../chunk-ACE77TKQ.js";
+} from "../chunk-BYNYYZWW.js";
+import "../chunk-6QWFMVCD.js";
 import "../chunk-USUCPCUC.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-NKXSILEW.js";

package/dist/bin/pushary-setup.js

@@ -14,7 +14,7 @@ import {
   npmErrorMessage,
   renderAgentInstructions,
   writeInstructionBlock
-} from "../chunk-UIBTFZUD.js";
+} from "../chunk-BHAMEPOP.js";
 import {
   isValidApiKey
 } from "../chunk-USUCPCUC.js";
@@ -541,7 +541,7 @@ var setupHermes = async (_apiKey) => {
 };
 var CODEX_HOOKS_JSON = join(CODEX_HOME, "hooks.json");
 var CODEX_HOOKS_MIN_VERSION = [0, 122, 0];
-var CODEX_TRUST_VERIFIED_MAX = [0, 138, 0];
+var CODEX_TRUST_VERIFIED_MAX = [0, 142, 2];
 var parseCodexVersion = (raw) => {
   const match = raw.match(/(\d+)\.(\d+)\.(\d+)/);
   if (!match) return null;

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

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   handleStop
-} from "../chunk-QY4L6XHN.js";
-import "../chunk-ACE77TKQ.js";
+} from "../chunk-BYNYYZWW.js";
+import "../chunk-6QWFMVCD.js";
 import "../chunk-USUCPCUC.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-NKXSILEW.js";