@pushary/agent-hooks 0.83.2 → 0.84.1

package/dist/{chunk-EHLTWCDZ.js → chunk-SEAHGHCE.js}

@@ -1,6 +1,6 @@
 import {
   HOOK_BUDGETS
-} from "./chunk-YWRJGYUH.js";
+} from "./chunk-MQMPG5X4.js";
 
 // src/codex-config.ts
 import { createHash } from "crypto";

package/dist/{chunk-NDC3TBHI.js → chunk-UKSQWTBH.js}

@@ -1,6 +1,6 @@
 import {
   HOOK_BUDGETS
-} from "./chunk-YWRJGYUH.js";
+} from "./chunk-MQMPG5X4.js";
 
 // src/claude-config.ts
 import { join } from "path";

package/dist/{chunk-UVAC2KHH.js → chunk-UXWEE3QI.js}

@@ -1,6 +1,6 @@
 import {
   codexHomeFrom
-} from "./chunk-EHLTWCDZ.js";
+} from "./chunk-SEAHGHCE.js";
 
 // src/vscode-config.ts
 import { homedir } from "os";

package/dist/{chunk-MUEW424A.js → chunk-VT4IVERX.js}

@@ -1,7 +1,7 @@
 // src/npm.ts
-import { execSync } from "child_process";
-import { existsSync } from "fs";
-import { join } from "path";
+import { execFileSync, execSync } from "child_process";
+import { existsSync, readFileSync, realpathSync } from "fs";
+import { dirname, join } from "path";
 var cleanNpmEnv = () => {
   const env = {};
   for (const [key, value] of Object.entries(process.env)) {
@@ -33,6 +33,50 @@ var resolveGlobalBinary = (name) => {
     return void 0;
   }
 };
+var resolvePathBinary = (name, platform = process.platform) => {
+  try {
+    return execFileSync(platform === "win32" ? "where" : "which", [name], {
+      encoding: "utf8",
+      stdio: "pipe",
+      timeout: 5e3
+    }).split(/\r?\n/, 1)[0]?.trim() || void 0;
+  } catch {
+    return void 0;
+  }
+};
+var resolveBinary = (name) => resolveGlobalBinary(name) ?? resolvePathBinary(name);
+var resolvePackageVersionFromBinary = (binary, packageName) => {
+  try {
+    let dir = dirname(realpathSync(binary));
+    const packagePath = packageName.split("/");
+    for (let depth = 0; depth < 8; depth++) {
+      for (const manifest of [
+        join(dir, "package.json"),
+        join(dir, "node_modules", ...packagePath, "package.json")
+      ]) {
+        try {
+          const value = JSON.parse(readFileSync(manifest, "utf8"));
+          if (value.name === packageName && typeof value.version === "string") return value.version;
+        } catch {
+        }
+      }
+      const parent = dirname(dir);
+      if (parent === dir) break;
+      dir = parent;
+    }
+  } catch {
+  }
+  return void 0;
+};
+var resolveGlobalPackageVersion = (name) => {
+  try {
+    const result = JSON.parse(execNpm("list -g --depth=0 --json --no-workspaces", { timeout: 5e3 }).toString());
+    const value = result.dependencies?.[name]?.version;
+    return typeof value === "string" ? value : void 0;
+  } catch {
+    return void 0;
+  }
+};
 var resolveGlobalBinDir = (probe) => {
   if (process.platform === "win32") return void 0;
   const resolved = resolveGlobalBinary(probe);
@@ -61,6 +105,9 @@ export {
   npmErrorMessage,
   execNpm,
   resolveGlobalBinary,
+  resolveBinary,
+  resolvePackageVersionFromBinary,
+  resolveGlobalPackageVersion,
   resolveGlobalBinDir,
   quoteIfNeeded,
   installGlobally

package/dist/{chunk-DHAZ6SOT.js → chunk-YR5TSPXB.js}

@@ -1,15 +1,15 @@
 import {
   PRETOOLUSE_HANDLED_TOOLS
-} from "./chunk-NDC3TBHI.js";
+} from "./chunk-UKSQWTBH.js";
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "./chunk-3AGM3TDM.js";
+} from "./chunk-NJ7JT26G.js";
 import {
   denyReasonFrom,
   isDeferAnswer,
   resolveGate
-} from "./chunk-4QQOKEOS.js";
+} from "./chunk-BLDDXHHA.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -29,13 +29,7 @@ import {
   sendNotification,
   throttlePass,
   waitForAnswer
-} from "./chunk-7PO2VEA4.js";
-import {
-  buildDecisionEpisodeFeatures,
-  effectiveWaitSeconds,
-  hookWaitClamped,
-  hookWaitDeadline
-} from "./chunk-YWRJGYUH.js";
+} from "./chunk-CCCJ6BPW.js";
 import {
   getMachineId
 } from "./chunk-RN3NOEJF.js";
@@ -43,6 +37,13 @@ import {
   getApiKey,
   getBaseUrl
 } from "./chunk-2UMNXADU.js";
+import {
+  buildDecisionEpisodeFeatures,
+  effectiveWaitSeconds,
+  hookWaitClamped,
+  hookWaitDeadline,
+  parseAgentQuestionAnswers
+} from "./chunk-MQMPG5X4.js";
 
 // src/decision-episode.ts
 var EPISODE_PATH = "/api/agent/decision-episode";
@@ -271,6 +272,7 @@ var dispatchModeHandler = async (apiKey, input, toolPolicy, machineId, trainingC
     action: deriveAction(input.tool_name, input.tool_input),
     blocker: scopeReason ?? deriveBlocker(toolPolicy.mode),
     actionBody: deriveActionBody(input.tool_name, input.tool_input),
+    repoKey: repoKeyFor(input.cwd),
     // Only when the breach is what caused the question, so an ordinary approval
     // can never silently widen a scope.
     scopePath: scopeReason ? scopePath : void 0,
@@ -352,10 +354,25 @@ var shouldDeferToNativeMode = (permissionMode, toolName) => {
 var MAX_PHONE_QUESTIONS = 4;
 var parseQuestion = (raw) => {
   const q = raw;
-  if (!q || typeof q.question !== "string" || q.multiSelect === true) return void 0;
-  const labels = Array.isArray(q.options) ? q.options.map((o) => o && typeof o === "object" ? o.label : void 0).filter((l) => typeof l === "string" && l.length > 0) : [];
+  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 } : {}
+    }];
+  }) : [];
+  const labels = options.map((option) => option.label);
   if (labels.length < 2) return void 0;
-  return { question: q.question, header: typeof q.header === "string" ? q.header : void 0, labels };
+  return {
+    question: q.question,
+    header: typeof q.header === "string" ? q.header : void 0,
+    multiSelect: q.multiSelect === true,
+    options,
+    labels
+  };
 };
 var parseQuestions = (toolInput) => {
   const questions = toolInput.questions;
@@ -364,20 +381,49 @@ var parseQuestions = (toolInput) => {
   const parsed = [];
   for (const raw of questions) {
     const one = parseQuestion(raw);
-    if (!one) return void 0;
+    if (!one || parsed.some((question) => question.question === one.question)) return void 0;
     parsed.push(one);
   }
   return parsed;
 };
-var questionContext = (q, index, total, project) => {
-  const subject = q.header ? `${q.header}: your agent is asking in ${project}` : `Your agent is asking in ${project}`;
+var questionContext = (question, index, total, project) => {
+  const subject = question.header ? `${question.header}: your agent is asking in ${project}` : `Your agent is asking in ${project}`;
   return total > 1 ? `${subject} (${index + 1} of ${total})` : subject;
 };
-var handleAskUserQuestion = async (apiKey, input) => {
-  const parsed = parseQuestions(input.tool_input ?? {});
-  if (!parsed) return void 0;
-  const projectName = basename(input.cwd ?? process.cwd());
-  const deadline = hookWaitDeadline(START_MS, effectiveWaitSeconds("wait", 0, "claude"), "claude", Date.now());
+var encodeAnswer = (question, value) => question.multiSelect ? JSON.stringify([value]) : value;
+var askAsOneCard = async (apiKey, input, parsed, projectName, deadline) => {
+  const only = parsed[0];
+  let result;
+  try {
+    result = await askUser(apiKey, {
+      question: only.question,
+      type: "select",
+      options: [...only.labels],
+      questions: parsed.map(({ labels: _, ...question }) => question),
+      context: questionContext(only, 0, 1, projectName),
+      agentName: `Claude Code - ${projectName}`,
+      sessionId: input.session_id,
+      machineId: getMachineId(),
+      toolName: "AskUserQuestion",
+      toolUseId: input.tool_use_id
+    });
+  } catch {
+    return void 0;
+  }
+  if (result.suppressed || result.noDevices) {
+    await cancelQuestion(apiKey, result.correlationId).catch(() => {
+    });
+    return void 0;
+  }
+  const answer = await pollForAnswer(apiKey, result.correlationId, deadline);
+  const values = answer.answered && answer.value ? parseAgentQuestionAnswers(parsed, answer.value) : null;
+  if (!values || isDeferAnswer(answer.value)) {
+    savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId);
+    return void 0;
+  }
+  return values;
+};
+var askQuestionByQuestion = async (apiKey, input, parsed, projectName, deadline) => {
   const answers = {};
   for (const [index, question] of parsed.entries()) {
     let result;
@@ -410,8 +456,17 @@ var handleAskUserQuestion = async (apiKey, input) => {
       savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId);
       return void 0;
     }
-    answers[question.question] = value;
+    answers[question.question] = encodeAnswer(question, value);
   }
+  return answers;
+};
+var handleAskUserQuestion = async (apiKey, input) => {
+  const parsed = parseQuestions(input.tool_input ?? {});
+  if (!parsed) return void 0;
+  const projectName = basename(input.cwd ?? process.cwd());
+  const deadline = hookWaitDeadline(START_MS, effectiveWaitSeconds("wait", 0, "claude"), "claude", Date.now());
+  const answers = parsed.length === 1 ? await askAsOneCard(apiKey, input, parsed, projectName, deadline) : await askQuestionByQuestion(apiKey, input, parsed, projectName, deadline);
+  if (!answers) return void 0;
   return allowWithInput({ ...input.tool_input ?? {}, answers });
 };
 var handleKeyless = (input) => {
@@ -438,7 +493,8 @@ var claudeGateInput = (modeState, config, input) => {
     toolInputs: [input.tool_input ?? {}],
     scopePaths: scopePath ? [scopePath] : [],
     cwd: input.cwd,
-    repoKey: repoKeyFor(input.cwd)
+    repoKey: repoKeyFor(input.cwd),
+    sessionId: input.session_id
   };
 };
 var handlePreToolUse = async (input) => {
@@ -451,7 +507,7 @@ var handlePreToolUse = async (input) => {
   }
   try {
     const modeState = await fetchModeState(apiKey, input.session_id);
-    const policy = await getPolicy(apiKey, modeState.policyVersion, "claude_code", true);
+    const policy = await getPolicy(apiKey, modeState.policyVersion, "claude_code", true, input.session_id);
     const verdict = resolveGate(claudeGateInput(modeState, policy, input));
     if (verdict.kind === "kill") return deny(verdict.reason);
     if (input.tool_name === "AskUserQuestion") {
@@ -509,7 +565,7 @@ var handlePermissionRequest = async (input) => {
   }
   try {
     const modeState = await fetchModeState(apiKey, input.session_id);
-    const policy = await getPolicy(apiKey, modeState.policyVersion, "claude_code", true);
+    const policy = await getPolicy(apiKey, modeState.policyVersion, "claude_code", true, input.session_id);
     const verdict = resolveGate(claudeGateInput(modeState, policy, input));
     switch (verdict.kind) {
       case "kill":

package/dist/src/index.d.ts

@@ -1,4 +1,4 @@
-import { PolicyConfig, ApprovalMode, ToolPolicy, ScopeContract } from '@pushary/contracts';
+import { PolicyConfig, ApprovalMode, ToolPolicy, ScopeContract, AgentQuestion } from '@pushary/contracts';
 export { ApprovalMode, PolicyConfig, ToolPolicy } from '@pushary/contracts';
 
 interface ToolInput {
@@ -27,9 +27,9 @@ interface ReceiptMeta {
     ok: boolean;
 }
 
-declare const getPolicy: (apiKey: string, expectedVersion?: string | null, agent?: string, repoAware?: boolean) => Promise<PolicyConfig>;
+declare const getPolicy: (apiKey: string, expectedVersion?: string | null, agent?: string, repoAware?: boolean, sessionId?: string) => Promise<PolicyConfig>;
 type AutoResolveOrigin = 'safe_readonly' | 'policy_timeout';
-declare const resolvePolicy: (config: PolicyConfig, toolName: string, modeOverride?: ApprovalMode | null, toolInput?: Record<string, unknown>, cwd?: string, repoKey?: string) => ToolPolicy;
+declare const resolvePolicy: (config: PolicyConfig, toolName: string, modeOverride?: ApprovalMode | null, toolInput?: Record<string, unknown>, cwd?: string, repoKey?: string, sessionId?: string) => ToolPolicy;
 interface ModeState {
     readonly mode: ApprovalMode | null;
     readonly kill: boolean;
@@ -76,6 +76,7 @@ interface AgentEvent {
 interface ReportEventOptions {
     maxAttempts?: number;
     timeoutMs?: number;
+    requireOk?: boolean;
     /**
      * Authenticate with this key instead of the ambient one.
      *
@@ -127,12 +128,14 @@ interface AskUserParams {
     question: string;
     type?: 'confirm' | 'select' | 'input';
     options?: string[];
+    questions?: AgentQuestion[];
     context?: string;
     agentName?: string;
     sessionId?: string;
     machineId?: string;
     toolName?: string;
     toolTarget?: string;
+    repoKey?: string;
     intent?: string;
     action?: string;
     blocker?: string;

package/dist/src/index.js

@@ -1,9 +1,9 @@
 import {
   handlePreToolUse
-} from "../chunk-DHAZ6SOT.js";
-import "../chunk-NDC3TBHI.js";
-import "../chunk-3AGM3TDM.js";
-import "../chunk-4QQOKEOS.js";
+} from "../chunk-YR5TSPXB.js";
+import "../chunk-UKSQWTBH.js";
+import "../chunk-NJ7JT26G.js";
+import "../chunk-BLDDXHHA.js";
 import {
   askUser,
   cancelQuestion,
@@ -16,18 +16,18 @@ import {
   reportEvent,
   resolvePolicy,
   waitForAnswer
-} from "../chunk-7PO2VEA4.js";
+} from "../chunk-CCCJ6BPW.js";
+import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-SAA3VBDK.js";
+import "../chunk-437T77TY.js";
 import "../chunk-7QLSKOSU.js";
-import "../chunk-YWRJGYUH.js";
-import "../chunk-RN3NOEJF.js";
+import "../chunk-KZERVKTD.js";
 import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-KZERVKTD.js";
+import "../chunk-MQMPG5X4.js";
 export {
   askUser,
   cancelQuestion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushary/agent-hooks",
-  "version": "0.83.2",
+  "version": "0.84.1",
   "description": "Permission hooks for AI coding agents: route tool approvals through Pushary push notifications",
   "keywords": [
     "pushary",
@@ -51,8 +51,10 @@
     "pushary-claude": "./dist/bin/pushary-claude.js",
     "pushary-daemon": "./dist/bin/pushary-daemon.js",
     "pushary-codex": "./dist/bin/pushary-codex.js",
+    "pushary-codex-bridge": "./dist/bin/pushary-codex-bridge.js",
     "pushary-codex-hook": "./dist/bin/pushary-codex-hook.js",
     "pushary-gemini-hook": "./dist/bin/pushary-gemini-hook.js",
+    "pushary-gemini-bridge": "./dist/bin/pushary-gemini-bridge.js",
     "pushary-setup": "./dist/bin/pushary-setup.js",
     "pushary-clean": "./dist/bin/pushary-clean.js",
     "pushary-status": "./dist/bin/pushary-status.js",