@pushary/agent-hooks 0.26.0 → 0.28.0

package/dist/chunk-IIENZE2J.js

@@ -0,0 +1,15 @@
+// src/wait-ladder.ts
+var describeWaitLadder = (p) => {
+  if (p.mode === "terminal_only") return "decide in the terminal, no push";
+  if (p.mode === "notify_only") return "send a heads-up, the terminal decides";
+  if (p.mode === "push_only") {
+    if (p.timeoutAction === "wait") return "wait for your phone, then ask in the terminal";
+    const tail = p.timeoutAction === "approve" ? "then auto-approve" : p.timeoutAction === "deny" ? "then auto-deny" : "then ask in the terminal";
+    return `wait for your phone up to ${p.timeoutSeconds}s, ${tail}`;
+  }
+  return `ping your phone ${p.pushFirstSeconds}s, then ask in the terminal`;
+};
+
+export {
+  describeWaitLadder
+};

package/dist/{chunk-A7DQCA2N.js → chunk-NFKYZY74.js}

@@ -2,185 +2,22 @@ import {
   callMcpTool,
   withRetry
 } from "./chunk-DWED7BS3.js";
+import {
+  ACTION_BODY_MAX,
+  DECISION_LINE_MAX,
+  extractPolicyArg,
+  isApprovalMode,
+  isSafeReadOnlyCommand,
+  matchRankWeight,
+  matchToolPattern,
+  redactSecrets,
+  redactSecretsDeep
+} from "./chunk-YRL4ZB4R.js";
 import {
   getApiKey,
   getBaseUrl
 } from "./chunk-NKXSILEW.js";
 
-// ../../../../../packages/contracts/src/index.ts
-var APPROVAL_MODES = ["push_only", "terminal_only", "push_first", "notify_only"];
-var isApprovalMode = (value) => typeof value === "string" && APPROVAL_MODES.includes(value);
-var MATCH_RANKS = ["none", "tool", "prefix", "exact"];
-var matchRankWeight = (rank) => MATCH_RANKS.indexOf(rank);
-var matchToolPattern = (pattern, toolName, arg) => {
-  const open = pattern.indexOf("(");
-  if (open === -1 || !pattern.endsWith(")")) {
-    return pattern === toolName ? "tool" : "none";
-  }
-  if (pattern.slice(0, open) !== toolName || arg === void 0) return "none";
-  const inner = pattern.slice(open + 1, -1);
-  if (inner.endsWith(":*")) {
-    return arg.startsWith(inner.slice(0, -2)) ? "prefix" : "none";
-  }
-  return arg === inner ? "exact" : "none";
-};
-var POLICY_ARG_KEYS = {
-  Bash: "command",
-  Edit: "file_path",
-  Write: "file_path"
-};
-var extractPolicyArg = (toolName, toolInput) => {
-  const key = POLICY_ARG_KEYS[toolName];
-  if (!key) return void 0;
-  const value = toolInput[key];
-  return typeof value === "string" ? value : void 0;
-};
-var SAFE_SHELL_COMMANDS = /* @__PURE__ */ new Set([
-  "ls",
-  "pwd",
-  "cd",
-  "cat",
-  "head",
-  "tail",
-  "wc",
-  "echo",
-  "printf",
-  "which",
-  "type",
-  "whoami",
-  "id",
-  "uname",
-  "arch",
-  "printenv",
-  "locale",
-  "tty",
-  "dirname",
-  "basename",
-  "realpath",
-  "readlink",
-  "stat",
-  "cut",
-  "nl",
-  "tr",
-  "comm",
-  "diff",
-  "cmp",
-  "grep",
-  "egrep",
-  "fgrep",
-  "jq",
-  "cksum",
-  "md5sum",
-  "sha1sum",
-  "sha256sum",
-  "du",
-  "df",
-  "ps",
-  "true"
-]);
-var SAFE_GIT_SUBCOMMANDS = /* @__PURE__ */ new Set([
-  "status",
-  "log",
-  "diff",
-  "show",
-  "rev-parse",
-  "describe",
-  "blame",
-  "shortlog",
-  "ls-files",
-  "ls-tree",
-  "cat-file",
-  "whatchanged",
-  "rev-list",
-  "name-rev",
-  "for-each-ref",
-  "var",
-  "count-objects"
-]);
-var GIT_WRITE_FLAGS = (token) => token === "--output" || token.startsWith("--output=");
-var UNSAFE_SHELL_CHARS = /[;&|<>(){}`\\\n\r]/;
-var basenameOf = (token) => {
-  const slash = Math.max(token.lastIndexOf("/"), token.lastIndexOf("\\"));
-  return slash === -1 ? token : token.slice(slash + 1);
-};
-var tokenizeShellCommand = (command) => {
-  const tokens = [];
-  let current = "";
-  let quote = null;
-  let started = false;
-  for (const ch of command) {
-    if (quote) {
-      if (ch === quote) quote = null;
-      else current += ch;
-      started = true;
-      continue;
-    }
-    if (ch === '"' || ch === "'") {
-      quote = ch;
-      started = true;
-      continue;
-    }
-    if (ch === " " || ch === "	") {
-      if (started) {
-        tokens.push(current);
-        current = "";
-        started = false;
-      }
-      continue;
-    }
-    current += ch;
-    started = true;
-  }
-  if (quote) return null;
-  if (started) tokens.push(current);
-  return tokens;
-};
-var isSafeReadOnlyCommand = (command) => {
-  const trimmed = command.trim();
-  if (!trimmed || trimmed.length > 2e3) return false;
-  if (UNSAFE_SHELL_CHARS.test(trimmed)) return false;
-  const tokens = tokenizeShellCommand(trimmed);
-  if (!tokens || tokens.length === 0) return false;
-  const first = tokens[0];
-  if (/^[A-Za-z_][A-Za-z0-9_]*=/.test(first) || first.includes("$")) return false;
-  const exe = basenameOf(first);
-  if (exe === "git") {
-    const sub = tokens[1];
-    if (!sub || sub.startsWith("-")) return false;
-    if (!SAFE_GIT_SUBCOMMANDS.has(sub)) return false;
-    return !tokens.some(GIT_WRITE_FLAGS);
-  }
-  return SAFE_SHELL_COMMANDS.has(exe);
-};
-var API_KEY_PATTERN = /^pk_[a-f0-9]+\.[a-f0-9]+$/;
-var isValidApiKey = (value) => API_KEY_PATTERN.test(value);
-var ACTION_BODY_MAX = 4e3;
-var DECISION_LINE_MAX = 500;
-var SECRET_REDACTION_RULES = [
-  { pattern: /-----BEGIN[A-Z0-9 ]*PRIVATE KEY-----[\s\S]*?-----END[A-Z0-9 ]*PRIVATE KEY-----/g, replacement: "[redacted key]" },
-  { pattern: /\bsk-[A-Za-z0-9_-]{16,}\b/g, replacement: "[redacted]" },
-  { pattern: /\b[spr]k_(?:live|test)_[A-Za-z0-9]{8,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bwhsec_[A-Za-z0-9]{16,}\b/g, replacement: "[redacted]" },
-  { pattern: /\b(?:ghp|gho|ghu|ghs|ghr)_[A-Za-z0-9]{36,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bgithub_pat_[A-Za-z0-9_]{22,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bglpat-[A-Za-z0-9_-]{20,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bxox[baprs]-[A-Za-z0-9-]{10,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bAIza[A-Za-z0-9_-]{35}\b/g, replacement: "[redacted]" },
-  { pattern: /\bAKIA[0-9A-Z]{16}\b/g, replacement: "[redacted]" },
-  { pattern: /\bnpm_[A-Za-z0-9]{36}\b/g, replacement: "[redacted]" },
-  { pattern: /\bxai-[A-Za-z0-9]{16,}\b/g, replacement: "[redacted]" },
-  { pattern: /\beyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bbearer\s+[A-Za-z0-9._~+/=-]+/gi, replacement: "bearer [redacted]" },
-  { pattern: /\bauthorization:\s*\S+/gi, replacement: "authorization: [redacted]" },
-  {
-    pattern: /((?:secret|token|password|passwd|api[_-]?key|access[_-]?key|client[_-]?secret|private[_-]?key)\s*[=:]\s*)("[^"]*"|'[^']*'|\S+)/gi,
-    replacement: "$1[redacted]"
-  }
-];
-var HIGH_ENTROPY_RULE = { pattern: /[A-Za-z0-9+/]{40,}={0,2}/g, replacement: "[redacted]" };
-var redactSecrets = (text) => SECRET_REDACTION_RULES.reduce((acc, rule) => acc.replace(rule.pattern, rule.replacement), text);
-var redactSecretsDeep = (text) => redactSecrets(text).replace(HIGH_ENTROPY_RULE.pattern, HIGH_ENTROPY_RULE.replacement);
-
 // src/validate.ts
 var isPolicyConfig = (data) => {
   if (!data || typeof data !== "object") return false;
@@ -818,20 +655,52 @@ var readLastPrompt = (sessionId) => {
     return void 0;
   }
 };
-var cleanupPendingQuestions = async (sessionId) => {
+var reconcilePendingQuestions = async (sessionId) => {
+  const late = [];
   try {
     const files = listPendingQuestions(sessionId);
+    if (files.length === 0) return late;
     const apiKey = getApiKey();
     for (const correlationId of files) {
       try {
-        await cancelQuestion(apiKey, correlationId);
+        const answer = await waitForAnswer(apiKey, correlationId, 1e3);
+        if (answer.answered) {
+          late.push({ correlationId, value: answer.value });
+          continue;
+        }
+        await cancelQuestion(apiKey, correlationId).catch(() => {
+        });
       } catch {
+        continue;
       }
       removePendingQuestion(sessionId, correlationId);
     }
-    if (!isDefaultSession(sessionId)) removePendingSession(sessionId);
   } catch {
   }
+  return late;
+};
+var describeLateAnswer = (value) => {
+  const v = (value ?? "").trim();
+  if (v === "yes") return "approved it";
+  if (v === "no") return "rejected it";
+  if (v === "defer") return "chose to handle it on this machine";
+  return v ? `answered "${v.slice(0, 200)}"` : "responded";
+};
+var buildLateAnswerContext = (late) => {
+  if (late.length === 0) return void 0;
+  const parts = late.map((l) => `you ${describeLateAnswer(l.value)} on your phone`);
+  return `Pushary: a permission prompt you were sent was answered late \u2014 ${parts.join("; ")} \u2014 after the terminal already took over. Treat this as the user's latest intent; do not assume the earlier terminal decision matched it.`;
+};
+var notifyLateAnswers = async (apiKey, late, agentName, sessionId) => {
+  if (late.length === 0) return;
+  const summary = late.map((l) => describeLateAnswer(l.value)).join(", ");
+  await sendNotification(apiKey, {
+    title: "Answer arrived late",
+    body: `You ${summary} after the agent had already moved on.`,
+    agentName,
+    sessionId
+  }, 2500).catch(() => {
+  });
 };
 var CLAUDE_CODE_AGENT = { type: "claude_code", label: "Claude Code" };
 var POLICY_CACHE_TTL_MS = 5 * 60 * 1e3;
@@ -917,10 +786,15 @@ var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
     const receiptsEnabled = process.env.PUSHARY_RECEIPTS !== "off";
     const sessionKey = input.session_id || DEFAULT_SESSION;
     const liveMode = await fetchModeState(getApiKey(), input.session_id);
+    const late = await reconcilePendingQuestions(sessionKey);
+    let additionalContext;
+    if (late.length > 0 && agent.type === CLAUDE_CODE_AGENT.type) {
+      additionalContext = buildLateAnswerContext(late);
+      for (const l of late) removePendingQuestion(sessionKey, l.correlationId);
+    }
     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 = [
-      cleanupPendingQuestions(sessionKey),
       reportEvent({
         event: isError ? "tool_error" : "tool_complete",
         agentType: agent.type,
@@ -948,16 +822,25 @@ var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
       );
     }
     await Promise.allSettled(reports);
+    return additionalContext;
   } catch {
+    return void 0;
   }
 };
 var TASK_TITLE_MAX_LENGTH = 120;
 var handleUserPrompt = async (input, agent = CLAUDE_CODE_AGENT) => {
   try {
     const projectName = basename(input.cwd ?? process.cwd());
+    const sessionKey = input.session_id || DEFAULT_SESSION;
     const titlesEnabled = process.env.PUSHARY_TASK_TITLES !== "off";
     const taskTitle = titlesEnabled ? input.prompt?.replace(/\s+/g, " ").trim().slice(0, TASK_TITLE_MAX_LENGTH) || void 0 : void 0;
-    if (input.prompt) saveLastPrompt(input.session_id || DEFAULT_SESSION, input.prompt);
+    if (input.prompt) saveLastPrompt(sessionKey, input.prompt);
+    const late = await reconcilePendingQuestions(sessionKey);
+    let additionalContext;
+    if (late.length > 0 && agent.type === CLAUDE_CODE_AGENT.type) {
+      additionalContext = buildLateAnswerContext(late);
+      for (const l of late) removePendingQuestion(sessionKey, l.correlationId);
+    }
     await reportEvent({
       event: "user_prompt",
       agentType: agent.type,
@@ -965,14 +848,17 @@ var handleUserPrompt = async (input, agent = CLAUDE_CODE_AGENT) => {
       sessionId: input.session_id,
       taskTitle
     }, { maxAttempts: 1, timeoutMs: 800 });
+    return additionalContext;
   } catch {
+    return void 0;
   }
 };
 var handleStop = async (input, agent = CLAUDE_CODE_AGENT) => {
   try {
     const projectName = basename(input.cwd ?? process.cwd());
-    const [, reported] = await Promise.allSettled([
-      cleanupPendingQuestions(input.session_id || DEFAULT_SESSION),
+    const sessionKey = input.session_id || DEFAULT_SESSION;
+    const late = await reconcilePendingQuestions(sessionKey);
+    const tasks = [
       reportEvent({
         event: "session_end",
         agentType: agent.type,
@@ -981,7 +867,13 @@ var handleStop = async (input, agent = CLAUDE_CODE_AGENT) => {
         sessionId: input.session_id,
         usage: deriveUsage(input.transcript_path, input.session_id)
       })
-    ]);
+    ];
+    if (late.length > 0) {
+      tasks.push(notifyLateAnswers(getApiKey(), late, `${agent.label} - ${projectName}`, input.session_id));
+      for (const l of late) removePendingQuestion(sessionKey, l.correlationId);
+    }
+    if (!isDefaultSession(sessionKey)) removePendingSession(sessionKey);
+    const [reported] = await Promise.allSettled(tasks);
     const pendingCommand = reported.status === "fulfilled" ? reported.value?.pendingCommand : void 0;
     if (typeof pendingCommand === "string" && pendingCommand.trim().length > 0) {
       return {
@@ -1010,8 +902,6 @@ var handleNotification = async (input) => {
 };
 
 export {
-  isValidApiKey,
-  DECISION_LINE_MAX,
   askUser,
   waitForAnswer,
   cancelQuestion,

package/dist/{chunk-SLX4AONG.js → chunk-QDPUTE2V.js}

@@ -1,9 +1,13 @@
+import {
+  HOOK_BUDGETS
+} from "./chunk-YRL4ZB4R.js";
+
 // src/codex-config.ts
 import { createHash } from "crypto";
 var CODEX_HOOK_BINARY = "pushary-codex-hook";
 var CODEX_HOOK_EVENTS = [
-  { event: "PermissionRequest", matcher: "Bash|apply_patch", timeout: 180, statusMessage: "Waiting for your phone" },
-  { event: "PreToolUse", matcher: "Bash|apply_patch", timeout: 180, statusMessage: "Checking Pushary policy" },
+  { event: "PermissionRequest", matcher: "Bash|apply_patch", timeout: HOOK_BUDGETS.codex.budgetSeconds, statusMessage: "Waiting for your phone" },
+  { event: "PreToolUse", matcher: "Bash|apply_patch", timeout: HOOK_BUDGETS.codex.budgetSeconds, statusMessage: "Checking Pushary policy" },
   { event: "PostToolUse", matcher: "Bash|apply_patch", timeout: 10 },
   { event: "UserPromptSubmit", timeout: 10 },
   { event: "Stop", timeout: 10 },
@@ -141,7 +145,7 @@ var addCodexHookTrust = (config, hooksJsonPath, command) => {
 var GEMINI_HOOK_BINARY = "pushary-gemini-hook";
 var GEMINI_MCP_URL = "https://pushary.com/api/mcp/mcp";
 var GEMINI_HOOK_EVENTS = [
-  { event: "BeforeTool", matcher: "run_shell_command|write_file|replace", timeoutMs: 18e4 },
+  { event: "BeforeTool", matcher: "run_shell_command|write_file|replace", timeoutMs: HOOK_BUDGETS.gemini.budgetSeconds * 1e3 },
   { event: "AfterTool", matcher: "run_shell_command|write_file|replace", timeoutMs: 1e4 },
   { event: "BeforeAgent", timeoutMs: 1e4 },
   { event: "SessionStart", timeoutMs: 1e4 },