@pushary/agent-hooks 0.87.3 → 0.88.0

package/dist/bin/pushary-upgrade.js

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 import {
   detectClaudeVersion
-} from "../chunk-ICERLAE2.js";
+} from "../chunk-DXBUFXPL.js";
 import {
   addClaudeMcpServer,
   addPusharyHooks,
   addPusharyToolPermissions
-} from "../chunk-2JYQAW4B.js";
+} from "../chunk-U6HRYNHC.js";
 import {
   GEMINI_HOOK_BINARY,
   addGeminiHooks,
   addGeminiMcpServer,
   hasGeminiHooks
-} from "../chunk-K42RXJPG.js";
+} from "../chunk-MY5A4EPQ.js";
 import "../chunk-ATBKJNWS.js";
 import {
   guardBinary
@@ -37,7 +37,7 @@ import {
   hasCodexHooks,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-VL5ZNK6V.js";
+} from "../chunk-VHHVGVFQ.js";
 import "../chunk-GIRT7677.js";
 import {
   exitOnHelpFlag
@@ -53,7 +53,7 @@ import "../chunk-KZERVKTD.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";
-import "../chunk-DMW54VWK.js";
+import "../chunk-3JL64GVE.js";
 
 // bin/pushary-upgrade.ts
 import { existsSync as existsSync2 } from "fs";

package/dist/bin/pushary-wait.js

@@ -4,8 +4,8 @@ import {
 } from "../chunk-IIENZE2J.js";
 import {
   exitOnFailedResponse
-} from "../chunk-TD3M232T.js";
-import "../chunk-KFAH6KRE.js";
+} from "../chunk-3PSEZOC4.js";
+import "../chunk-6BOE5NJZ.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
@@ -28,7 +28,7 @@ import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-DMW54VWK.js";
+import "../chunk-3JL64GVE.js";
 
 // bin/pushary-wait.ts
 exitOnHelpFlag("wait");

package/dist/{chunk-LGVHYFIB.js → chunk-3B3PYTKH.js}

@@ -1,6 +1,6 @@
 import {
   pusharyDir
-} from "./chunk-VL5ZNK6V.js";
+} from "./chunk-VHHVGVFQ.js";
 import {
   readJsonSafe
 } from "./chunk-6MTNS63X.js";

package/dist/{chunk-DMW54VWK.js → chunk-3JL64GVE.js}

@@ -1,6 +1,39 @@
 // ../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 MAX_AGENT_QUESTIONS = 4;
+var parseAgentQuestion = (raw) => {
+  const q = raw;
+  if (!q || typeof q.question !== "string") return void 0;
+  const options = Array.isArray(q.options) ? q.options.flatMap((option) => {
+    if (!option || typeof option !== "object") return [];
+    const value = option;
+    if (typeof value.label !== "string" || value.label.length === 0) return [];
+    return [{
+      label: value.label,
+      ...typeof value.description === "string" ? { description: value.description } : {}
+    }];
+  }) : [];
+  if (options.length < 2) return void 0;
+  return {
+    question: q.question,
+    ...typeof q.header === "string" ? { header: q.header } : {},
+    multiSelect: q.multiSelect === true,
+    options
+  };
+};
+var parseAgentQuestions = (toolInput) => {
+  const questions = toolInput.questions;
+  if (!Array.isArray(questions) || questions.length === 0) return void 0;
+  if (questions.length > MAX_AGENT_QUESTIONS) return void 0;
+  const parsed = [];
+  for (const raw of questions) {
+    const one = parseAgentQuestion(raw);
+    if (!one || parsed.some((question) => question.question === one.question)) return void 0;
+    parsed.push(one);
+  }
+  return parsed;
+};
 var parseAgentQuestionAnswers = (questions, value) => {
   let parsed;
   try {
@@ -72,6 +105,7 @@ var hookWaitDeadline = (startMs, policyWaitSeconds, agent, nowMs) => {
 };
 var hookWaitClamped = (startMs, policyWaitSeconds, agent, nowMs) => startMs + hookMaxWaitSeconds(agent) * 1e3 < nowMs + Math.max(policyWaitSeconds, 0) * 1e3;
 var effectiveWaitSeconds = (timeoutAction, policySeconds, agent) => timeoutAction === "wait" ? hookMaxWaitSeconds(agent) : policySeconds;
+var HOOK_SOURCES = ["claude", "codex", "gemini", "cursor", "vscode", "opencode"];
 var AGENT_LABELS_BY_TYPE = {
   claude_code: "Claude Code",
   claude_cowork: "Claude Cowork",
@@ -86,6 +120,7 @@ var AGENT_LABELS_BY_TYPE = {
   unknown: "Agent"
 };
 var OPENCODE_APPROVAL_EVENT = "permission.ask";
+var CURSOR_GATE_EVENTS = ["beforeShellExecution", "beforeMCPExecution"];
 var HOOK_LOCATOR_BINARY = "pushary-bridge";
 var HOOK_BATCH_MAX_BYTES = 4 * 1024 * 1024;
 var REPO_KEY_MAX_LENGTH = 200;
@@ -960,8 +995,15 @@ var resolveAutoResolveOrigin = (config, toolName, toolInput, cwd, repoKey, sessi
 var resolvePolicy = (config, toolName, modeOverride, toolInput, cwd, repoKey, sessionId) => {
   const args = toolInput ? policyArgForms(toolName, toolInput, cwd) : [];
   const arg = args[0];
-  const match = selectGoverningRule(config.policies, toolName, args, repoKey, sessionId);
-  let base = match?.policy ?? config.policies.find((p) => p.tool === "*") ?? {
+  const governing = (pool) => {
+    if (pool.length === 0) return void 0;
+    const rule = selectGoverningRule(pool, toolName, args, repoKey, sessionId);
+    if (rule) return rule;
+    const wildcard = pool.find((p) => p.tool === "*");
+    return wildcard ? { policy: wildcard, rank: "wildcard" } : void 0;
+  };
+  const match = governing(config.policies.filter((p) => !p.origin)) ?? governing(config.policies.filter((p) => p.origin === "preset")) ?? governing(config.policies.filter((p) => p.origin === "builtin"));
+  let base = match?.policy ?? {
     tool: toolName,
     timeoutSeconds: config.defaultTimeoutSeconds,
     timeoutAction: config.defaultTimeoutAction,
@@ -1013,6 +1055,21 @@ var strictestScopeVerdict = (scope, paths) => {
   return worst;
 };
 var survivesDegraded = (config, toolName, toolInputs, cwd, repoKey, sessionId) => toolInputs.length === 1 && resolveAutoResolveOrigin(config, toolName, toolInputs[0], cwd, repoKey, sessionId) === "safe_readonly";
+var FULL_DEFER_MODES = /* @__PURE__ */ new Set(["plan", "auto", "dontAsk"]);
+var ACCEPT_EDITS_DEFER_TOOLS = /* @__PURE__ */ new Set([
+  "Write",
+  "Edit",
+  "MultiEdit",
+  "NotebookEdit"
+]);
+var shouldDeferToNativeMode = (permissionMode, toolName, options = {}) => {
+  if (options.respectPermissionMode === false) return false;
+  if (typeof permissionMode !== "string") return false;
+  if (FULL_DEFER_MODES.has(permissionMode)) return true;
+  if (permissionMode === "acceptEdits" && ACCEPT_EDITS_DEFER_TOOLS.has(toolName)) return true;
+  if (permissionMode === "bypassPermissions") return options.deferBypass === true;
+  return false;
+};
 var resolveGate = (input) => {
   const { modeState, config, toolName, toolInputs, cwd, repoKey, sessionId } = input;
   if (modeState.kill) return { kind: "kill", reason: KILL_REASON };
@@ -1068,6 +1125,33 @@ var claudePreToolUseOutput = (decision, reason, updatedInput) => ({
     ...updatedInput ? { updatedInput } : {}
   }
 });
+var PENDING_COMMAND_PREFIX = "The user sent a new instruction from their phone via Pushary:";
+var pendingCommandEvents = (source) => {
+  switch (source) {
+    case "claude":
+      return ["PostToolUse", "UserPromptSubmit", "Stop"];
+    // Codex carries context on its activity events and NOT on Stop, whose output
+    // schema has no context field at all. Draining for it at the turn boundary
+    // was therefore right to render nothing, and wrong to conclude that Codex
+    // could not be sent a message.
+    case "codex":
+      return ["PostToolUse", "PreToolUse", "UserPromptSubmit"];
+    case "gemini":
+      return ["AfterTool", "BeforeTool", "BeforeAgent"];
+    // Registered events only. Cursor's carriers are `postToolUse` and `stop`,
+    // which this build does not write into the config; the ones it does write
+    // (`afterShellExecution`, `afterFileEdit`, `afterAgentResponse`) are
+    // observational and discard whatever they print.
+    case "cursor":
+      return [];
+    case "vscode":
+      return [];
+    // The prompt is appended through the TUI rather than through a hook return,
+    // so there is nothing for this to print.
+    case "opencode":
+      return [];
+  }
+};
 var claudePermissionRequestOutput = (decision, reason, updatedInput) => ({
   hookSpecificOutput: {
     hookEventName: "PermissionRequest",
@@ -1103,7 +1187,7 @@ var gateOutputFor = (source, event, decision, reason) => {
     output = decision === "allow" ? { decision: "allow" } : { decision: "deny", reason: reason ?? "Denied from Pushary" };
   } else if (source === "opencode" && event === OPENCODE_APPROVAL_EVENT) {
     output = decision === "deny" ? { status: "deny", reason: reason ?? "Denied from Pushary" } : { status: decision };
-  } else if (source === "cursor" && event === "beforeShellExecution") {
+  } else if (source === "cursor" && CURSOR_GATE_EVENTS.includes(event)) {
     output = decision === "allow" ? { permission: "allow" } : decision === "ask" ? { permission: "ask" } : {
       permission: "deny",
       user_message: "Command denied via Pushary.",
@@ -1125,14 +1209,17 @@ var claudeElicitationOutput = (event, action, content) => ({
 var renderElicitationOutput = (event, action, content) => ELICITATION_EVENTS.includes(event) ? JSON.stringify(claudeElicitationOutput(event, action, content)) : void 0;
 
 export {
+  parseAgentQuestions,
   parseAgentQuestionAnswers,
   normalizeInstallSource,
   HOOK_BUDGETS,
   hookWaitDeadline,
   hookWaitClamped,
   effectiveWaitSeconds,
+  HOOK_SOURCES,
   AGENT_LABELS_BY_TYPE,
   OPENCODE_APPROVAL_EVENT,
+  CURSOR_GATE_EVENTS,
   HOOK_LOCATOR_BINARY,
   normalizeRepoRemote,
   localRepoKey,
@@ -1148,9 +1235,12 @@ export {
   resolveAutoResolveOrigin,
   resolvePolicy,
   KILL_REASON,
+  shouldDeferToNativeMode,
   resolveGate,
   modeStateFromResponse,
   claudePreToolUseOutput,
+  PENDING_COMMAND_PREFIX,
+  pendingCommandEvents,
   claudePermissionRequestOutput,
   gateOutputFor,
   renderElicitationOutput

package/dist/{chunk-TD3M232T.js → chunk-3PSEZOC4.js}

@@ -1,7 +1,7 @@
 import {
   describeKeyCheck,
   keyCheckFromResponse
-} from "./chunk-KFAH6KRE.js";
+} from "./chunk-6BOE5NJZ.js";
 import {
   createIo
 } from "./chunk-5RUIFDTP.js";

package/dist/{chunk-VIHRP25S.js → chunk-4VYELDAH.js}

@@ -1,6 +1,6 @@
 import {
   isSafeReadOnlyCommand
-} from "./chunk-DMW54VWK.js";
+} from "./chunk-3JL64GVE.js";
 
 // src/ledger.ts
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync } from "fs";

package/dist/{chunk-YX6ZKCC5.js → chunk-67TNJVJW.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-6MTNS63X.js";
 import {
   resolveInstallSourceFor
-} from "./chunk-KBS53WOE.js";
+} from "./chunk-VSCSZ2LI.js";
 import {
   configFilePath
 } from "./chunk-2UMNXADU.js";

package/dist/{chunk-KFAH6KRE.js → chunk-6BOE5NJZ.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-2UMNXADU.js";
 import {
   isValidApiKey
-} from "./chunk-DMW54VWK.js";
+} from "./chunk-3JL64GVE.js";
 
 // src/session.ts
 var IDENTITY_PATH = "/api/v1/server/identity";

package/dist/{chunk-ZGC3W23N.js → chunk-DSTZ2RBU.js}

@@ -1,7 +1,7 @@
 import {
   HOOK_BUDGETS,
   OPENCODE_APPROVAL_EVENT
-} from "./chunk-DMW54VWK.js";
+} from "./chunk-3JL64GVE.js";
 
 // src/opencode-plugin.ts
 var OPENCODE_PLUGIN_MARKER = "pushary-opencode-plugin w1";

package/dist/{chunk-ICERLAE2.js → chunk-DXBUFXPL.js}

@@ -1,6 +1,6 @@
 import {
   parseVersion
-} from "./chunk-K42RXJPG.js";
+} from "./chunk-MY5A4EPQ.js";
 
 // src/setup/agent-probe.ts
 import { execSync } from "child_process";

package/dist/{chunk-EJL3PJU7.js → chunk-ESARAYRI.js}

@@ -11,7 +11,7 @@ import {
 } from "./chunk-BSZYIAZL.js";
 import {
   reportedInstallSource
-} from "./chunk-KBS53WOE.js";
+} from "./chunk-VSCSZ2LI.js";
 
 // src/reach.ts
 var reachVerdict = (channels) => {

package/dist/{chunk-7J67NYK4.js → chunk-F5W3AY6L.js}

@@ -5,7 +5,7 @@ import {
   FILE_TARGET_TOOLS,
   redactSecrets,
   redactSecretsDeep
-} from "./chunk-DMW54VWK.js";
+} from "./chunk-3JL64GVE.js";
 
 // ../hook-mapping/src/describe.ts
 import { isAbsolute, relative, resolve } from "path";
@@ -280,6 +280,7 @@ export {
   deriveActionBody,
   deriveAction,
   deriveBlocker,
+  AGENT_IDENTITIES,
   summarizeStop,
   sessionStartAction,
   sessionEndAction,

package/dist/{chunk-QLMX5LLV.js → chunk-LEYXXXRN.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-2UMNXADU.js";
 import {
   redactSecrets
-} from "./chunk-DMW54VWK.js";
+} from "./chunk-3JL64GVE.js";
 
 // src/crypto.ts
 import nacl from "tweetnacl";

package/dist/{chunk-VOE4SYPR.js → chunk-MNXG6IIM.js}

@@ -10,6 +10,7 @@ import {
   waitForAnswer
 } from "./chunk-J3YDT4HM.js";
 import {
+  AGENT_IDENTITIES,
   deriveReceiptMeta,
   deriveToolTarget,
   describeToolCall,
@@ -21,7 +22,7 @@ import {
   summarizeStop,
   taskTitleFrom,
   toolResultErrorText
-} from "./chunk-7J67NYK4.js";
+} from "./chunk-F5W3AY6L.js";
 import {
   getMachineId
 } from "./chunk-RN3NOEJF.js";
@@ -30,20 +31,23 @@ import {
 } from "./chunk-BSZYIAZL.js";
 import {
   reportedInstallSource
-} from "./chunk-KBS53WOE.js";
+} from "./chunk-VSCSZ2LI.js";
 import {
   getApiKey,
   getBaseUrl
 } from "./chunk-2UMNXADU.js";
 import {
+  HOOK_SOURCES,
+  PENDING_COMMAND_PREFIX,
   gateOutputFor,
   isAutoApprove,
   localRepoKey,
   modeStateFromResponse,
   normalizeRepoRemote,
+  pendingCommandEvents,
   resolveAutoResolveOrigin,
   resolvePolicy
-} from "./chunk-DMW54VWK.js";
+} from "./chunk-3JL64GVE.js";
 
 // src/policy.ts
 import { createHash } from "crypto";
@@ -648,7 +652,6 @@ 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;
@@ -657,6 +660,11 @@ var mergeAdditionalContext = (existing, reported) => {
 
 ${injected}` : injected;
 };
+var consumesActivityContext = (agentType) => {
+  const source = HOOK_SOURCES.find((candidate) => AGENT_IDENTITIES[candidate].type === agentType);
+  if (!source) return false;
+  return pendingCommandEvents(source).some((event) => event !== "Stop");
+};
 var detectInstallMode = () => (process.argv[1] ?? "").includes("_npx") ? "npx" : "cli";
 var reportEvent = async (event, options = {}) => {
   const apiKey = options.apiKey ?? getApiKey();
@@ -691,7 +699,15 @@ var reportEvent = async (event, options = {}) => {
         // 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
+        //
+        // And only when this caller kept the full budget. The pop is a destructive
+        // LPOP that happens before the response is written, so a caller that
+        // abandons the request destroys the message: `user_prompt` runs on a human
+        // keystroke and gave it 800ms, which a cold function misses routinely.
+        // Asking the server to consume something we may not wait to receive is the
+        // one shape that loses it outright, and the instruction reaches the agent
+        // on its next tool call instead.
+        canDrainCommand: consumesActivityContext(event.agentType) && options.timeoutMs === void 0
       }),
       signal: AbortSignal.timeout(options.timeoutMs ?? 1e4)
     });
@@ -750,7 +766,7 @@ var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
       );
     }
     const [reported] = await Promise.allSettled([toolReport, ...extraReports]);
-    if (agent.type === CLAUDE_CODE_AGENT.type) {
+    if (consumesActivityContext(agent.type)) {
       additionalContext = mergeAdditionalContext(additionalContext, reported);
     }
     return additionalContext;
@@ -780,7 +796,7 @@ var handleUserPrompt = async (input, agent = CLAUDE_CODE_AGENT) => {
         taskTitle
       }, { maxAttempts: 1, timeoutMs: 800 })
     ]);
-    if (agent.type === CLAUDE_CODE_AGENT.type) {
+    if (consumesActivityContext(agent.type)) {
       additionalContext = mergeAdditionalContext(additionalContext, reported);
     }
     return additionalContext;

package/dist/{chunk-K42RXJPG.js → chunk-MY5A4EPQ.js}

@@ -5,7 +5,7 @@ import {
 import {
   HOOK_BUDGETS,
   HOOK_LOCATOR_BINARY
-} from "./chunk-DMW54VWK.js";
+} from "./chunk-3JL64GVE.js";
 
 // src/gemini-config.ts
 var GEMINI_HOOK_BINARY = "pushary-gemini-hook";

package/dist/{chunk-KCAFCGGY.js → chunk-OULRSHFB.js}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-VT4IVERX.js";
 import {
   pusharyDir
-} from "./chunk-VL5ZNK6V.js";
+} from "./chunk-VHHVGVFQ.js";
 import {
   getMachineId
 } from "./chunk-RN3NOEJF.js";

package/dist/{chunk-TAYHEJFF.js → chunk-RSUBLTMP.js}

@@ -1,9 +1,9 @@
 import {
   hasGeminiHooks
-} from "./chunk-K42RXJPG.js";
+} from "./chunk-MY5A4EPQ.js";
 import {
   hasCodexHooks
-} from "./chunk-VL5ZNK6V.js";
+} from "./chunk-VHHVGVFQ.js";
 
 // src/diagnostics/wiring.ts
 var record = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;

package/dist/{chunk-DPUOW6NS.js → chunk-T2XZH7D5.js}

@@ -1,9 +1,9 @@
 import {
   openCodeConfigDirFrom
-} from "./chunk-ZGC3W23N.js";
+} from "./chunk-DSTZ2RBU.js";
 import {
   codexHomeFrom
-} from "./chunk-VL5ZNK6V.js";
+} from "./chunk-VHHVGVFQ.js";
 
 // src/vscode-config.ts
 import { homedir } from "os";
@@ -326,9 +326,6 @@ var hasInstructionBlock = (filePath) => {
   }
 };
 
-// src/hooks-spec.ts
-var CURSOR_GATE_EVENTS = ["beforeShellExecution", "beforeMCPExecution"];
-
 export {
   registerPluginLocation,
   unregisterPluginLocation,
@@ -345,6 +342,5 @@ export {
   renderProjectAgentInstructions,
   writeInstructionBlock,
   removeInstructionBlock,
-  hasInstructionBlock,
-  CURSOR_GATE_EVENTS
+  hasInstructionBlock
 };

package/dist/{chunk-2JYQAW4B.js → chunk-U6HRYNHC.js}

@@ -1,13 +1,13 @@
 import {
   CLAUDE_HOOK_EVENTS,
   supportedClaudeEvents
-} from "./chunk-K42RXJPG.js";
+} from "./chunk-MY5A4EPQ.js";
 import {
   guardBinary
 } from "./chunk-B7ZBHWOW.js";
 import {
   HOOK_LOCATOR_BINARY
-} from "./chunk-DMW54VWK.js";
+} from "./chunk-3JL64GVE.js";
 
 // src/claude-config.ts
 import { join } from "path";