@pushary/agent-hooks 0.21.0 → 0.22.0

package/data/cursor-plugin/scripts/pushary-gate.mjs

@@ -231,6 +231,25 @@ const fetchModeState = async (apiKey, sessionId) => {
   }
 }
 
+// ── action body capture + redaction (inlined mirror of describe.ts, since this
+// dependency-free hook cannot import the workspace) ──────────────────────────────
+const ACTION_BODY_MAX = 4000
+const ACTION_BODY_TRUNCATION_MARKER = '\n… [truncated]'
+const REDACTION_RULES = [
+  [/\bsk-[A-Za-z0-9]{20,}\b/g, '[redacted]'],
+  [/\bpk_(?:live|test)_[A-Za-z0-9]+\b/g, '[redacted]'],
+  [/\brk_[A-Za-z0-9]+\b/g, '[redacted]'],
+  [/\bAKIA[0-9A-Z]{16}\b/g, '[redacted]'],
+  [/\bbearer\s+[A-Za-z0-9._-]+/gi, 'bearer [redacted]'],
+  [/\bauthorization:\s*\S+/gi, 'authorization: [redacted]'],
+  [/((?:secret|token|password|passwd|api[_-]?key|private[_-]?key)\s*[=:]\s*)(\S+)/gi, '$1[redacted]'],
+  [/[A-Za-z0-9+/]{40,}={0,2}/g, '[redacted]'],
+]
+const redactSecrets = (text) => REDACTION_RULES.reduce((acc, [pattern, replacement]) => acc.replace(pattern, replacement), text)
+const capActionBody = (text) =>
+  text.length <= ACTION_BODY_MAX ? text : `${text.slice(0, ACTION_BODY_MAX - ACTION_BODY_TRUNCATION_MARKER.length)}${ACTION_BODY_TRUNCATION_MARKER}`
+const deriveActionBody = (command) => capActionBody(redactSecrets(command))
+
 // ── ask / wait ───────────────────────────────────────────────────────────────
 const askArgs = (command, project, ident) => ({
   question: `Allow this command?\n\n${command}`,
@@ -240,6 +259,7 @@ const askArgs = (command, project, ident) => ({
   sessionId: ident.sessionId,
   machineId: ident.machineId,
   toolName: 'Bash',
+  actionBody: deriveActionBody(command),
   wait: false,
 })
 
@@ -278,7 +298,10 @@ const handlePushOnly = async (apiKey, command, project, ident, timeoutSeconds, t
   const realMs = Math.max(timeoutSeconds, 1) * 1000
   const cap = Math.min(realMs, MAX_BLOCK_MS)
   const answer = await pollForAnswer(apiKey, asked.correlationId, Date.now() + cap)
-  if (answer.answered) return answer.value === 'yes' ? ALLOW : deny(DENIED)
+  if (answer.answered) {
+    if (answer.value === 'defer') return ask()
+    return answer.value === 'yes' ? ALLOW : deny(DENIED)
+  }
 
   // If Cursor's hook limit cut us off before the configured timeout, hand off to
   // Cursor's own prompt rather than misapplying the policy's timeout action.
@@ -298,7 +321,10 @@ const handlePushFirst = async (apiKey, command, project, ident, pushFirstSeconds
 
   const cap = Math.min(Math.max(pushFirstSeconds, 1) * 1000, MAX_BLOCK_MS)
   const answer = await pollForAnswer(apiKey, asked.correlationId, Date.now() + cap)
-  if (answer.answered) return answer.value === 'yes' ? ALLOW : deny(DENIED)
+  if (answer.answered) {
+    if (answer.value === 'defer') return ask()
+    return answer.value === 'yes' ? ALLOW : deny(DENIED)
+  }
   return ask('Sent to your phone via Pushary — you can also approve here.')
 }
 

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

@@ -1,35 +1,40 @@
 #!/usr/bin/env node
 import {
-  denyReasonFrom
-} from "../chunk-N7VXDBQU.js";
+  denyReasonFrom,
+  isDeferAnswer
+} from "../chunk-KQYIHZ5E.js";
 import {
   CODEX_AGENT,
+  DEFAULT_SESSION,
+  askUser,
   codexAllow,
   codexDeny,
   codexPass,
+  deriveActionBody,
+  deriveBlocker,
+  deriveToolTarget,
+  describeApplyPatch,
+  describeToolCall,
+  fetchModeState,
+  getMachineId,
+  getPolicy,
   handlePostToolUse,
   handleStop,
   handleUserPrompt,
   permissionTimeoutDecision,
   preToolUseTimeoutDecision,
+  readLastPrompt,
   reportEvent,
-  toCodexWire,
-  toPolicyLookup
-} from "../chunk-QY4L6XHN.js";
-import {
-  DEFAULT_SESSION,
-  askUser,
-  deriveToolTarget,
-  describeToolCall,
-  fetchModeState,
-  getMachineId,
-  getPolicy,
   resolvePolicy,
   savePendingQuestion,
   sendNotification,
+  toCodexWire,
+  toPolicyLookup,
   waitForAnswer
-} from "../chunk-ACE77TKQ.js";
-import "../chunk-USUCPCUC.js";
+} from "../chunk-M4GDBGXF.js";
+import {
+  DECISION_LINE_MAX
+} from "../chunk-WPVL6VIT.js";
 import "../chunk-DWED7BS3.js";
 import {
   getApiKey
@@ -41,6 +46,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 = () => {
@@ -104,11 +110,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, mode) => {
   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",
@@ -116,18 +121,25 @@ 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),
+    intent: readLastPrompt(input.session_id || DEFAULT_SESSION),
+    action: description.slice(0, DECISION_LINE_MAX),
+    blocker: deriveBlocker(mode),
+    actionBody: deriveActionBody(input.tool_name ?? "", input.tool_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()
@@ -140,7 +152,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();
@@ -149,12 +161,13 @@ var decidePermissionRequest = async (input) => {
     }
     if (toolPolicy.mode === "terminal_only") return codexPass();
     if (toolPolicy.mode === "notify_only") {
-      if (claimNotify(input.tool_use_id)) 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, toolPolicy.mode);
     if (answer.answered) {
+      if (isDeferAnswer(answer.value)) return codexPass();
       if (answer.value === "yes") {
         if (toolPolicy.mode === "push_only") markApproved(input.tool_use_id);
         return codexAllow();
@@ -175,7 +188,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();
@@ -186,19 +199,20 @@ 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, "push_only");
       } catch {
         return preToolUseTimeoutDecision(toolPolicy.timeoutAction, "Push notification failed, denying per policy");
       }
       const { answer, correlationId } = pushed;
       if (answer.answered) {
+        if (isDeferAnswer(answer.value)) return codexPass();
         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") {
-      if (claimNotify(input.tool_use_id)) await notifyApprovalNeeded(apiKey, input);
+      if (claimNotify(input.tool_use_id)) await notifyApprovalNeeded(apiKey, input, lookup);
       return codexPass();
     }
     return codexPass();
@@ -244,15 +258,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,13 +1,11 @@
 #!/usr/bin/env node
-import {
-  reportEvent
-} from "../chunk-QY4L6XHN.js";
 import {
   askUser,
   getMachineId,
+  reportEvent,
   waitForAnswer
-} from "../chunk-ACE77TKQ.js";
-import "../chunk-USUCPCUC.js";
+} from "../chunk-M4GDBGXF.js";
+import "../chunk-WPVL6VIT.js";
 import "../chunk-DWED7BS3.js";
 import {
   getApiKey

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

@@ -1,27 +1,32 @@
 #!/usr/bin/env node
 import {
-  denyReasonFrom
-} from "../chunk-N7VXDBQU.js";
-import {
-  handlePostToolUse,
-  handleStop,
-  handleUserPrompt,
-  reportEvent
-} from "../chunk-QY4L6XHN.js";
+  denyReasonFrom,
+  isDeferAnswer
+} from "../chunk-KQYIHZ5E.js";
 import {
   DEFAULT_SESSION,
   askUser,
+  deriveActionBody,
+  deriveBlocker,
   deriveToolTarget,
   describeToolCall,
   fetchModeState,
   getMachineId,
   getPolicy,
+  handlePostToolUse,
+  handleStop,
+  handleUserPrompt,
+  readLastPrompt,
+  readLastUserPrompt,
+  reportEvent,
   resolvePolicy,
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "../chunk-ACE77TKQ.js";
-import "../chunk-USUCPCUC.js";
+} from "../chunk-M4GDBGXF.js";
+import {
+  DECISION_LINE_MAX
+} from "../chunk-WPVL6VIT.js";
 import "../chunk-DWED7BS3.js";
 import {
   getApiKey
@@ -66,6 +71,7 @@ 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 pollForAnswer = async (apiKey, correlationId, deadlineMs, pollInterval = 2e3) => {
   while (Date.now() < deadlineMs) {
@@ -85,7 +91,7 @@ var pollForAnswer = async (apiKey, correlationId, deadlineMs, pollInterval = 2e3
   return { answered: false };
 };
 var agentNameFor = (input) => `${GEMINI_AGENT.label} - ${basename(input.cwd ?? process.cwd())}`;
-var pushQuestion = async (apiKey, input, lookup, waitSeconds, pollInterval = 2e3) => {
+var pushQuestion = async (apiKey, input, lookup, waitSeconds, mode, pollInterval = 2e3) => {
   const projectName = basename(input.cwd ?? process.cwd());
   const description = describeToolCall(lookup.tool, lookup.input, "hook");
   const result = await askUser(apiKey, {
@@ -96,9 +102,16 @@ var pushQuestion = async (apiKey, input, lookup, waitSeconds, pollInterval = 2e3
     sessionId: input.session_id,
     machineId: getMachineId(),
     toolName: lookup.tool,
-    toolTarget: deriveToolTarget(lookup.tool, lookup.input)
+    toolTarget: deriveToolTarget(lookup.tool, lookup.input),
+    intent: readLastPrompt(input.session_id || DEFAULT_SESSION) ?? (input.transcript_path ? readLastUserPrompt(input.transcript_path) : void 0),
+    action: description.slice(0, DECISION_LINE_MAX),
+    blocker: deriveBlocker(mode),
+    actionBody: deriveActionBody(input.tool_name ?? "", input.tool_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 };
 };
@@ -117,12 +130,13 @@ var notifyApprovalNeeded = async (apiKey, input, lookup) => {
 var handlePushOnly = async (apiKey, input, lookup, timeoutSeconds, timeoutAction) => {
   let pushed;
   try {
-    pushed = await pushQuestion(apiKey, input, lookup, timeoutSeconds);
+    pushed = await pushQuestion(apiKey, input, lookup, timeoutSeconds, "push_only");
   } catch {
     return geminiTimeoutDecision(timeoutAction, "Push notification failed, denying per policy");
   }
   const { answer, correlationId } = pushed;
   if (answer.answered) {
+    if (isDeferAnswer(answer.value)) return geminiPass();
     return answer.value === "yes" ? geminiAllow() : geminiDeny(denyReasonFrom(answer.value));
   }
   savePendingQuestion(input.session_id || DEFAULT_SESSION, correlationId);
@@ -131,12 +145,13 @@ var handlePushOnly = async (apiKey, input, lookup, timeoutSeconds, timeoutAction
 var handlePushFirst = async (apiKey, input, lookup, pushFirstSeconds) => {
   let pushed;
   try {
-    pushed = await pushQuestion(apiKey, input, lookup, pushFirstSeconds, 1500);
+    pushed = await pushQuestion(apiKey, input, lookup, pushFirstSeconds, "push_first", 1500);
   } catch {
     return geminiPass();
   }
   const { answer, correlationId } = pushed;
   if (answer.answered) {
+    if (isDeferAnswer(answer.value)) return geminiPass();
     return answer.value === "yes" ? geminiAllow() : geminiDeny(denyReasonFrom(answer.value));
   }
   savePendingQuestion(input.session_id || DEFAULT_SESSION, correlationId);

package/dist/bin/pushary-hook.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   handlePreToolUse
-} from "../chunk-FXYTRZHC.js";
-import "../chunk-N7VXDBQU.js";
-import "../chunk-ACE77TKQ.js";
-import "../chunk-USUCPCUC.js";
+} from "../chunk-FGZZRCOG.js";
+import "../chunk-KQYIHZ5E.js";
+import "../chunk-M4GDBGXF.js";
+import "../chunk-WPVL6VIT.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-NKXSILEW.js";
 

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

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

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

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

package/dist/bin/pushary-setup.js

@@ -17,7 +17,7 @@ import {
 } from "../chunk-BHAMEPOP.js";
 import {
   isValidApiKey
-} from "../chunk-USUCPCUC.js";
+} from "../chunk-WPVL6VIT.js";
 
 // bin/pushary-setup.ts
 import { existsSync, readFileSync, writeFileSync, appendFileSync, mkdirSync, cpSync, rmSync, chmodSync } from "fs";

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

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