@pushary/agent-hooks 0.68.0 → 0.70.0

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

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 import {
+  KILL_REASON,
   denyReasonFrom,
-  isDeferAnswer
-} from "../chunk-YHG74UFF.js";
+  isDeferAnswer,
+  resolveGate
+} from "../chunk-GD275GEX.js";
 import {
   CODEX_AGENT,
   DEFAULT_SESSION,
@@ -24,14 +26,16 @@ import {
   permissionTimeoutDecision,
   preToolUseTimeoutDecision,
   readLastPrompt,
+  repoKeyFor,
   reportEvent,
-  resolvePolicy,
   savePendingQuestion,
+  scopePathFor,
   sendNotification,
   toCodexWire,
   toPolicyLookup,
+  toPolicyLookups,
   waitForAnswer
-} from "../chunk-XOUYM27W.js";
+} from "../chunk-FZIQSDTQ.js";
 import {
   isGatingMoment,
   recordKeylessMoment
@@ -57,7 +61,6 @@ import "../chunk-KZERVKTD.js";
 import { basename, join } from "path";
 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 START_MS = Date.now();
 var APPROVAL_TTL_MS = 10 * 60 * 1e3;
 var sanitizeId = (value) => value.replace(/[^A-Za-z0-9_-]/g, "_").slice(0, 128);
@@ -167,18 +170,33 @@ var notifyApprovalNeeded = async (apiKey, input, lookup) => {
   } catch {
   }
 };
+var codexGate = async (apiKey, input) => {
+  const modeState = await fetchModeState(apiKey, input.session_id);
+  const lookup = toPolicyLookup(input.tool_name ?? "", input.tool_input ?? {}, input.cwd);
+  const lookups = toPolicyLookups(input.tool_name ?? "", input.tool_input ?? {}, input.cwd);
+  const config = await getPolicy(apiKey, modeState.policyVersion, "codex");
+  const verdict = resolveGate({
+    modeState,
+    config,
+    toolName: lookups.tool,
+    toolInputs: lookups.inputs,
+    // Skipped entirely without a contract, which is the state of nearly every
+    // session. A multi-file patch contributes one path per file.
+    scopePaths: modeState.scope ? lookups.inputs.map((entry) => scopePathFor(lookups.tool, entry, input.cwd)).filter((path) => typeof path === "string") : [],
+    cwd: input.cwd,
+    repoKey: repoKeyFor(input.cwd)
+  });
+  return { verdict, lookup };
+};
 var decidePermissionRequest = async (input) => {
   try {
     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 ?? {}, input.cwd);
-    const policy = await getPolicy(apiKey, modeState.policyVersion, "codex");
-    const toolPolicy = resolvePolicy(policy, lookup.tool, modeState.mode, lookup.input);
-    if (toolPolicy.timeoutSeconds === 0 && toolPolicy.timeoutAction === "approve") return codexAllow();
-    if (toolPolicy.timeoutSeconds === 0 && toolPolicy.timeoutAction === "deny") {
-      return codexDeny(`Denied by policy for ${toolPolicy.tool}`);
-    }
+    const { verdict, lookup } = await codexGate(apiKey, input);
+    if (verdict.kind === "kill") return codexDeny(KILL_REASON);
+    if (verdict.kind === "allow") return codexAllow();
+    if (verdict.kind === "deny") return codexDeny(verdict.reason);
+    if (verdict.kind === "defer") return codexPass();
+    const toolPolicy = verdict.policy;
     if (toolPolicy.mode === "terminal_only") return codexPass();
     if (toolPolicy.mode === "notify_only") {
       if (claimNotify(input.tool_use_id)) await notifyApprovalNeeded(apiKey, input, lookup);
@@ -229,15 +247,12 @@ var decidePreToolUse = async (input) => {
     return codexPass();
   }
   try {
-    const modeState = await fetchModeState(apiKey, input.session_id);
-    if (modeState.kill) return codexDeny(KILL_REASON);
-    const lookup = toPolicyLookup(input.tool_name ?? "", input.tool_input ?? {}, input.cwd);
-    const policy = await getPolicy(apiKey, modeState.policyVersion, "codex");
-    const toolPolicy = resolvePolicy(policy, lookup.tool, modeState.mode, lookup.input);
-    if (toolPolicy.timeoutSeconds === 0 && toolPolicy.timeoutAction === "approve") return codexPass();
-    if (toolPolicy.timeoutSeconds === 0 && toolPolicy.timeoutAction === "deny") {
-      return codexDeny(`Denied by policy for ${toolPolicy.tool}`);
-    }
+    const { verdict, lookup } = await codexGate(apiKey, input);
+    if (verdict.kind === "kill") return codexDeny(KILL_REASON);
+    if (verdict.kind === "allow") return codexPass();
+    if (verdict.kind === "deny") return codexDeny(verdict.reason);
+    if (verdict.kind === "defer") return codexPass();
+    const toolPolicy = verdict.policy;
     if (toolPolicy.mode === "push_only") {
       if (consumeApproval(input.tool_use_id)) return codexPass();
       let pushed;

package/dist/bin/pushary-codex.js

@@ -3,7 +3,7 @@ import {
   askUser,
   reportEvent,
   waitForAnswer
-} from "../chunk-XOUYM27W.js";
+} from "../chunk-FZIQSDTQ.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-7QLSKOSU.js";

package/dist/bin/pushary-connect.js

@@ -6,7 +6,7 @@ import {
   confirmAppConnection,
   connectDevice,
   printConnectInstructions
-} from "../chunk-YMFZUXL5.js";
+} from "../chunk-MGFZXUUR.js";
 import "../chunk-3EGEA4KH.js";
 import {
   readKeySource
@@ -24,8 +24,8 @@ import {
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-ATP6UQPH.js";
-import "../chunk-JGH37QRB.js";
+} from "../chunk-BBK3TTU2.js";
+import "../chunk-7OYGFJYZ.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import {
@@ -84,7 +84,9 @@ var main = async () => {
     console.log();
     process.exit(EXIT.OK);
   }
-  console.log(`  ${dim("No device of yours can answer yet. Run")} ${cyan("pushary connect")} ${dim("again when you are ready.")}`);
+  console.log(`  ${dim("No device of yours can answer yet.")}`);
+  for (const line of result.repair ?? []) console.log(`  ${dim(line)}`);
+  console.log(`  ${dim("Then run")} ${cyan("pushary connect")} ${dim("again.")}`);
   console.log();
   process.exit(EXIT.NO_DEVICE);
 };

package/dist/bin/pushary-daemon.js

@@ -2,7 +2,7 @@
 import {
   HEARTBEAT_INTERVAL_MS,
   sendHeartbeat
-} from "../chunk-YZT2CBC3.js";
+} from "../chunk-NQTRA7H5.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
@@ -11,8 +11,8 @@ import {
 } from "../chunk-MUEW424A.js";
 import {
   exitOnHelpFlag
-} from "../chunk-ATP6UQPH.js";
-import "../chunk-JGH37QRB.js";
+} from "../chunk-BBK3TTU2.js";
+import "../chunk-7OYGFJYZ.js";
 import {
   getMachineId
 } from "../chunk-RN3NOEJF.js";

package/dist/bin/pushary-doctor.js

@@ -3,11 +3,19 @@ import {
   describeWaitLadder
 } from "../chunk-IIENZE2J.js";
 import {
+  claudeWired,
+  codexWired,
+  geminiWired
+} from "../chunk-B7R4YSAB.js";
+import {
+  agentProbes,
+  detectAgent,
   detectAllAgents,
   hasInstructionBlock,
+  isDetected,
   isPluginRegistered,
   vscodeSettingsTargets
-} from "../chunk-KB4ODLGB.js";
+} from "../chunk-I4BYZIX4.js";
 import {
   GEMINI_HOOK_BINARY,
   hasGeminiHooks,
@@ -27,6 +35,7 @@ import {
   geminiSettings,
   hasCodexHooks,
   missingCodexHookEvents,
+  pusharyConfigFile,
   readCodexMcpAuth,
   untrustedCodexHookEvents,
   vscodePluginDir
@@ -35,7 +44,7 @@ import {
   describeReach,
   fetchChannels,
   reachVerdict
-} from "../chunk-YMFZUXL5.js";
+} from "../chunk-MGFZXUUR.js";
 import "../chunk-3EGEA4KH.js";
 import {
   keyPrefix,
@@ -58,10 +67,10 @@ import {
 } from "../chunk-MUEW424A.js";
 import {
   exitOnHelpFlag
-} from "../chunk-ATP6UQPH.js";
+} from "../chunk-BBK3TTU2.js";
 import {
   getPackageVersion
-} from "../chunk-JGH37QRB.js";
+} from "../chunk-7OYGFJYZ.js";
 import {
   readLedgerSummary
 } from "../chunk-WLGEY4UX.js";
@@ -135,6 +144,16 @@ var redactText = (text) => text.replace(KEY_PATTERN, (match) => `${match.split("
 var redact = (bundle) => JSON.parse(redactText(JSON.stringify(bundle)));
 var bundleFileName = (bundle) => `pushary-diagnostics-${bundle.generatedAt.replace(/[:.]/g, "-")}.json`;
 
+// src/diagnostics/exit-code.ts
+var resolveDoctorExit = ({ keyExit, failures }) => {
+  if (keyExit !== null) return keyExit;
+  if (failures.length === 0) return EXIT.OK;
+  const every = (kind) => failures.every((f) => f.kind === kind);
+  if (every("unreachable")) return EXIT.UNREACHABLE;
+  if (every("reachability")) return EXIT.NO_DEVICE;
+  return EXIT.PROBLEMS_FOUND;
+};
+
 // bin/pushary-doctor.ts
 exitOnHelpFlag("doctor");
 var parseDoctorOptions = (argv) => {
@@ -215,12 +234,21 @@ var extractHookTimeout = (entries, needle) => {
   return null;
 };
 var results = [];
-var check = (passed, label, detail) => {
-  results.push({ passed, label, detail });
+var check = (passed, label, detail, kind = "config") => {
+  results.push({ passed, label, detail, kind });
   const icon = passed ? pass : fail;
   const suffix = detail ? ` ${dim(`(${detail})`)}` : "";
   console.log(`  ${icon} ${label}${suffix}`);
 };
+var probes = agentProbes();
+var installed = (agent) => isDetected(detectAgent(probes[agent]));
+var agentsChecked = [];
+var skipped = (label, why) => {
+  console.log(`  ${dim("\u2013")} ${label} ${dim(`(${why})`)}`);
+};
+var checking = (label) => {
+  agentsChecked.push(label);
+};
 var main = async () => {
   console.log();
   console.log(`  ${bold("Pushary Doctor")}`);
@@ -247,8 +275,12 @@ var main = async () => {
   if (keySource === "config-file") {
     console.log(`  ${pass} API key in ${dim(source.origin ?? "the config file")} ${dim(`(${maskKey(apiKey)})`)}`);
   } else if (keySource === "profile") {
-    console.log(`  ${pass} API key in shell profile ${dim(`(${maskKey(apiKey)})`)}`);
-    console.log(`  ${warn} Re-run ${cyan("npx @pushary/agent-hooks setup")} so hooks read it from ${dim("~/.pushary/config.json")} without a shell reload`);
+    check(
+      false,
+      "API key readable by hooks",
+      `found only in a shell profile (${maskKey(apiKey)}), which hooks do not read \u2014 re-run setup, or open a new terminal`
+    );
+    console.log(`    ${dim("Hooks read $PUSHARY_API_KEY, then")} ${dim(pusharyConfigFile())}`);
   } else {
     check(!!apiKey, "API key in environment", apiKey ? maskKey(apiKey) : "PUSHARY_API_KEY not set");
   }
@@ -282,19 +314,34 @@ var main = async () => {
         check(false, "Key format", "expected pk_xxx.xxx");
         break;
       case "unreachable":
-        console.log(`  ${warn} Could not verify the key with pushary.com ${dim(`(${keyVerdict.detail})`)}`);
+        check(false, "Key verified with pushary.com", `could not reach pushary.com (${keyVerdict.detail})`, "unreachable");
         break;
     }
   }
   const CLAUDE_JSON = claudeJson();
-  const claudeJson2 = readJson(CLAUDE_JSON);
+  const claudeInPlay = claudeWired({
+    claudeJson: readJson(CLAUDE_JSON),
+    settings: readJson(CLAUDE_SETTINGS),
+    skillExists: existsSync(SKILL_PATH)
+  });
+  const claudeJson2 = claudeInPlay ? readJson(CLAUDE_JSON) : null;
   const mcpServers = claudeJson2?.mcpServers ?? {};
   const pusharyServer = mcpServers?.pushary;
-  check(!!pusharyServer, "Claude Code: MCP server configured");
-  if (pusharyServer) {
-    check(pusharyServer.type === "http", "Claude Code: MCP server type", pusharyServer.type ? String(pusharyServer.type) : 'missing \u2014 add type: "http"');
+  if (!claudeInPlay) {
+    skipped("Claude Code", installed("claude_code") ? "installed, but Pushary is not set up for it" : "not installed");
+  } else {
+    checking("Claude Code");
+    check(!!pusharyServer, "Claude Code: MCP server configured");
+    if (pusharyServer) {
+      check(pusharyServer.type === "http", "Claude Code: MCP server type", pusharyServer.type ? String(pusharyServer.type) : 'missing \u2014 add type: "http"');
+      const claudeAuth = pusharyServer.headers?.Authorization;
+      if (typeof claudeAuth === "string" && apiKey) {
+        const matches = claudeAuth === `Bearer ${apiKey}`;
+        check(matches, "Claude Code: MCP key matches active key", matches ? void 0 : "the key in ~/.claude.json is not the key hooks use (rotated?) \u2014 re-run setup");
+      }
+    }
   }
-  const settings = readJson(CLAUDE_SETTINGS);
+  const settings = claudeInPlay ? readJson(CLAUDE_SETTINGS) : null;
   if (settings) {
     const hooks = settings.hooks;
     const CLAUDE_HOOK_CHECKS = [
@@ -325,19 +372,24 @@ var main = async () => {
     if (hasLegacyPerms) {
       console.log(`  ${warn} Legacy individual permissions detected ${dim("(run pushary clean, then setup again)")}`);
     }
-  } else {
+  } else if (claudeInPlay) {
     check(false, "Claude Code: settings.json", "not found");
   }
   const codexConfigPath = codexConfigToml();
   const codexHooksPath = codexHooksJson();
   const codexHooksConfig = readJson(codexHooksPath);
-  if (existsSync(codexConfigPath) || codexHooksConfig) {
-    const codexConfig = existsSync(codexConfigPath) ? readFileSync(codexConfigPath, "utf-8") : "";
-    let codexParsed = {};
-    try {
-      codexParsed = parseTOML(codexConfig);
-    } catch {
-    }
+  const codexConfig = existsSync(codexConfigPath) ? readFileSync(codexConfigPath, "utf-8") : "";
+  let codexParsed = {};
+  try {
+    codexParsed = parseTOML(codexConfig);
+  } catch {
+  }
+  if (codexWired({
+    config: codexParsed,
+    hooks: codexHooksConfig,
+    skillExists: existsSync(join(codexSkillDir(), "SKILL.md"))
+  })) {
+    checking("Codex");
     const codexMcp = codexParsed.mcp_servers?.pushary;
     const codexTransport = !!codexMcp && (typeof codexMcp.url === "string" || typeof codexMcp.command === "string");
     const codexAuth = readCodexMcpAuth(codexParsed);
@@ -401,10 +453,13 @@ var main = async () => {
     const codexAgentsMd2 = codexAgentsMd();
     const hasCodexInstructions = hasInstructionBlock(codexAgentsMd2);
     check(hasCodexInstructions, "Codex: proactive instructions (AGENTS.md)", hasCodexInstructions ? codexAgentsMd2 : "missing \u2014 re-run setup so Codex asks via push, not the terminal");
+  } else {
+    skipped("Codex", installed("codex") ? "installed, but Pushary is not set up for it" : "not installed");
   }
   const geminiSettingsPath = geminiSettings();
   const geminiSettings2 = readJson(geminiSettingsPath);
-  if (geminiSettings2) {
+  if (geminiSettings2 && geminiWired({ settings: geminiSettings2 })) {
+    checking("Gemini CLI");
     const geminiServers = geminiSettings2.mcpServers ?? {};
     const geminiPushary = geminiServers.pushary;
     check(!!geminiPushary, "Gemini CLI: MCP server configured");
@@ -443,12 +498,15 @@ var main = async () => {
     const geminiMd2 = geminiMd();
     const hasGeminiInstructions = hasInstructionBlock(geminiMd2);
     check(hasGeminiInstructions, "Gemini CLI: proactive instructions (GEMINI.md)", hasGeminiInstructions ? geminiMd2 : "missing \u2014 re-run setup so Gemini asks via push, not the terminal");
+  } else {
+    skipped("Gemini CLI", installed("gemini_cli") ? "installed, but Pushary is not set up for it" : "not installed");
   }
   const cursorPluginDir2 = cursorPluginDir();
   if (existsSync(cursorPluginDir2)) {
+    checking("Cursor");
     const cursorUserHooks2 = cursorUserHooks();
     const userHooks = readJson(cursorUserHooks2);
-    const gateEntry = userHooks.hooks?.beforeShellExecution?.find(
+    const gateEntry = userHooks?.hooks?.beforeShellExecution?.find(
       (h) => String(h.command ?? "").includes("pushary-gate")
     );
     if (!gateEntry) {
@@ -465,12 +523,17 @@ var main = async () => {
       check(false, "Cursor: API key linked", "no Authorization in plugin mcp.json \u2014 re-run setup");
     } else if (cursorAuth.includes("PUSHARY_API_KEY")) {
       check(false, "Cursor: API key linked", "plugin relies on $PUSHARY_API_KEY; re-run setup to embed the key so the gate works when Cursor is launched from the GUI");
+    } else if (apiKey && cursorAuth !== `Bearer ${apiKey}`) {
+      check(false, "Cursor: API key matches active key", "the embedded key is not the key hooks use (rotated?) \u2014 re-run setup");
     } else {
       check(true, "Cursor: API key linked", "embedded in plugin mcp.json");
     }
+  } else {
+    skipped("Cursor", installed("cursor") ? "installed, but Pushary is not set up for it" : "not installed");
   }
   const vscodePluginDir2 = vscodePluginDir();
   if (existsSync(vscodePluginDir2)) {
+    checking("VS Code");
     const registeredIn = vscodeSettingsTargets(existsSync).filter(
       (settingsPath) => existsSync(settingsPath) && isPluginRegistered(readFileSync(settingsPath, "utf-8"), vscodePluginDir2)
     );
@@ -499,11 +562,22 @@ var main = async () => {
       check(false, "VS Code: API key linked", "no Authorization in plugin .mcp.json \u2014 re-run setup");
     } else if (vscodeAuth.includes("PUSHARY_API_KEY")) {
       check(false, "VS Code: API key linked", "plugin relies on $PUSHARY_API_KEY; re-run setup to embed the key so the gate works when VS Code is launched from the GUI");
+    } else if (apiKey && vscodeAuth !== `Bearer ${apiKey}`) {
+      check(false, "VS Code: API key matches active key", "the embedded key is not the key hooks use (rotated?) \u2014 re-run setup");
     } else {
       check(true, "VS Code: API key linked", "embedded in plugin .mcp.json");
     }
+  } else {
+    skipped("VS Code", installed("vscode") ? "installed, but Pushary is not set up for it" : "not installed");
+  }
+  check(
+    agentsChecked.length > 0,
+    "Wired to at least one agent",
+    agentsChecked.length > 0 ? agentsChecked.join(", ") : "Pushary is installed but configured for no agent \u2014 run npx @pushary/agent-hooks@latest setup"
+  );
+  if (claudeInPlay) {
+    check(existsSync(SKILL_PATH), "Skill installed", existsSync(SKILL_PATH) ? SKILL_PATH : "not found");
   }
-  check(existsSync(SKILL_PATH), "Skill installed", existsSync(SKILL_PATH) ? SKILL_PATH : "not found");
   let globalVersion2 = "";
   try {
     globalVersion2 = execNpm("list -g --no-workspaces @pushary/agent-hooks --depth=0", { timeout: 1e4 }).toString().match(/@pushary\/agent-hooks@([\d.]+)/)?.[1] ?? "";
@@ -613,11 +687,21 @@ var main = async () => {
     console.log(`  ${dim("Notification Delivery")}`);
     const probe = await fetchChannels(apiKey);
     if (probe.kind !== "ok") {
-      check(false, "Phone reachable", probe.kind === "unreachable" ? `could not read your devices (${probe.detail})` : probe.kind === "locked" ? "no plan active, so nothing can be delivered" : "the server rejected this key");
+      check(
+        false,
+        "Phone reachable",
+        probe.kind === "unreachable" ? `could not read your devices (${probe.detail})` : probe.kind === "locked" ? "no plan active, so nothing can be delivered" : "the server rejected this key",
+        probe.kind === "unreachable" ? "unreachable" : "config"
+      );
     } else if (probe.status.precise) {
       const channels = probe.status;
       const verdict = reachVerdict(channels);
-      check(verdict.kind === "yours", "Phone reachable", verdict.kind === "yours" ? describeReach(channels) : verdict.kind === "nobody" ? "nothing connected, run pushary connect or get the app at https://pushary.com/download" : `${describeReach(channels)}; run pushary connect to add your own`);
+      check(
+        verdict.kind === "yours",
+        "Phone reachable",
+        verdict.kind === "yours" ? describeReach(channels) : verdict.kind === "nobody" ? "nothing connected, run pushary connect or get the app at https://pushary.com/download" : `${describeReach(channels)}; run pushary connect to add your own`,
+        "reachability"
+      );
     }
     const pushSuppressed = !options.roundtrip && (options.noPush || options.json || !process.stdout.isTTY);
     if (pushSuppressed) {
@@ -662,6 +746,14 @@ var main = async () => {
           });
           const elapsed = ((Date.now() - start) / 1e3).toFixed(1);
           check(waitResult.answered === true, "Answer received", waitResult.answered ? `"${waitResult.value}" (${elapsed}s roundtrip)` : "no response within timeout");
+          if (waitResult.answered !== true) {
+            await callMcpTool(apiKey, "cancel_question", { correlationId: askResult.correlationId }, {
+              id: 5,
+              sessionId,
+              timeoutMs: 1e4
+            }).catch(() => {
+            });
+          }
         } else {
           check(false, "Question sent", "failed to get correlationId");
         }
@@ -710,7 +802,7 @@ var main = async () => {
   }
   console.log();
   const keyExit = keyVerdict && (keyVerdict.kind === "rejected" || keyVerdict.kind === "locked" || keyVerdict.kind === "malformed") ? describeKeyCheck(keyVerdict).exitCode : null;
-  const exitCode = keyExit ?? (failed.length > 0 ? EXIT.PROBLEMS_FOUND : EXIT.OK);
+  const exitCode = resolveDoctorExit({ keyExit, failures: failed });
   if (options.bundle) {
     try {
       const bundle = redact(

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

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 import {
+  KILL_REASON,
   denyReasonFrom,
-  isDeferAnswer
-} from "../chunk-YHG74UFF.js";
+  isDeferAnswer,
+  resolveGate
+} from "../chunk-GD275GEX.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -18,12 +20,13 @@ import {
   handleUserPrompt,
   readLastPrompt,
   readLastUserPrompt,
+  repoKeyFor,
   reportEvent,
-  resolvePolicy,
   savePendingQuestion,
+  scopePathFor,
   sendNotification,
   waitForAnswer
-} from "../chunk-XOUYM27W.js";
+} from "../chunk-FZIQSDTQ.js";
 import {
   isGatingMoment,
   recordKeylessMoment
@@ -49,6 +52,7 @@ import "../chunk-KZERVKTD.js";
 import { basename } from "path";
 
 // src/gemini-adapter.ts
+import { isAbsolute, resolve } from "path";
 var GEMINI_AGENT = { type: "gemini_cli", label: "Gemini CLI" };
 var GEMINI_TOOL_MAP = {
   run_shell_command: "Bash",
@@ -57,7 +61,7 @@ var GEMINI_TOOL_MAP = {
   read_file: "Read"
 };
 var firstString = (...values) => values.find((v) => typeof v === "string" && v.length > 0);
-var toGeminiPolicyLookup = (toolName, toolInput) => {
+var toGeminiPolicyLookup = (toolName, toolInput, cwd) => {
   const canonical = GEMINI_TOOL_MAP[toolName];
   if (!canonical) return { tool: toolName, input: toolInput };
   if (canonical === "Bash") {
@@ -65,7 +69,11 @@ var toGeminiPolicyLookup = (toolName, toolInput) => {
     return { tool: "Bash", input: command ? { command } : {} };
   }
   const filePath = firstString(toolInput.file_path, toolInput.absolute_path, toolInput.path);
-  return { tool: canonical, input: filePath ? { file_path: filePath } : {} };
+  if (!filePath) return { tool: canonical, input: {} };
+  return {
+    tool: canonical,
+    input: { file_path: cwd && !isAbsolute(filePath) ? resolve(cwd, filePath) : filePath }
+  };
 };
 var geminiAllow = () => ({ kind: "allow" });
 var geminiDeny = (reason) => ({ kind: "deny", reason });
@@ -82,9 +90,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 START_MS = Date.now();
-var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var sleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
 var pollForAnswer = async (apiKey, correlationId, deadlineMs, pollInterval = 2e3) => {
   while (Date.now() < deadlineMs) {
     const remaining = Math.min(Math.max(deadlineMs - Date.now(), 1e3), 3e4);
@@ -210,14 +217,23 @@ var decideBeforeTool = async (input) => {
   }
   try {
     const modeState = await fetchModeState(apiKey, input.session_id);
-    if (modeState.kill) return geminiDeny(KILL_REASON);
-    const lookup = toGeminiPolicyLookup(input.tool_name ?? "", input.tool_input ?? {});
-    const policy = await getPolicy(apiKey, modeState.policyVersion, "gemini_cli");
-    const toolPolicy = resolvePolicy(policy, lookup.tool, modeState.mode, lookup.input);
-    if (toolPolicy.timeoutSeconds === 0 && toolPolicy.timeoutAction === "approve") return geminiAllow();
-    if (toolPolicy.timeoutSeconds === 0 && toolPolicy.timeoutAction === "deny") {
-      return geminiDeny(`Denied by policy for ${toolPolicy.tool}`);
-    }
+    const lookup = toGeminiPolicyLookup(input.tool_name ?? "", input.tool_input ?? {}, input.cwd);
+    const config = await getPolicy(apiKey, modeState.policyVersion, "gemini_cli");
+    const scopePath = modeState.scope ? scopePathFor(lookup.tool, lookup.input, input.cwd) : void 0;
+    const verdict = resolveGate({
+      modeState,
+      config,
+      toolName: lookup.tool,
+      toolInputs: [lookup.input],
+      scopePaths: scopePath ? [scopePath] : [],
+      cwd: input.cwd,
+      repoKey: repoKeyFor(input.cwd)
+    });
+    if (verdict.kind === "kill") return geminiDeny(KILL_REASON);
+    if (verdict.kind === "allow") return geminiAllow();
+    if (verdict.kind === "deny") return geminiDeny(verdict.reason);
+    if (verdict.kind === "defer") return geminiPass();
+    const toolPolicy = verdict.policy;
     switch (toolPolicy.mode) {
       case "push_only":
         return handlePushOnly(apiKey, input, lookup, toolPolicy.timeoutSeconds, toolPolicy.timeoutAction);

package/dist/bin/pushary-hook.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import {
   handlePreToolUse
-} from "../chunk-SONXGCZY.js";
+} from "../chunk-HU43EZ5Q.js";
 import "../chunk-CAJZAFVS.js";
 import {
   exitOnHelpFlag
-} from "../chunk-ATP6UQPH.js";
-import "../chunk-JGH37QRB.js";
-import "../chunk-YHG74UFF.js";
-import "../chunk-XOUYM27W.js";
+} from "../chunk-BBK3TTU2.js";
+import "../chunk-7OYGFJYZ.js";
+import "../chunk-GD275GEX.js";
+import "../chunk-FZIQSDTQ.js";
 import "../chunk-WLGEY4UX.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";

package/dist/bin/pushary-login.js

@@ -21,10 +21,10 @@ import {
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-ATP6UQPH.js";
+} from "../chunk-BBK3TTU2.js";
 import {
   getPackageVersion
-} from "../chunk-JGH37QRB.js";
+} from "../chunk-7OYGFJYZ.js";
 import "../chunk-SAF6HGAA.js";
 import {
   UsageError

package/dist/bin/pushary-logout.js

@@ -19,8 +19,8 @@ import {
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-ATP6UQPH.js";
-import "../chunk-JGH37QRB.js";
+} from "../chunk-BBK3TTU2.js";
+import "../chunk-7OYGFJYZ.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";

package/dist/bin/pushary-mode.js

@@ -11,8 +11,8 @@ import {
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-ATP6UQPH.js";
-import "../chunk-JGH37QRB.js";
+} from "../chunk-BBK3TTU2.js";
+import "../chunk-7OYGFJYZ.js";
 import "../chunk-SAF6HGAA.js";
 import {
   UsageError

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   handleNotification
-} from "../chunk-XOUYM27W.js";
+} from "../chunk-FZIQSDTQ.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-7QLSKOSU.js";

package/dist/bin/pushary-permission-denied-hook.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   handlePermissionDenied
-} from "../chunk-SONXGCZY.js";
+} from "../chunk-HU43EZ5Q.js";
 import "../chunk-CAJZAFVS.js";
-import "../chunk-YHG74UFF.js";
-import "../chunk-XOUYM27W.js";
+import "../chunk-GD275GEX.js";
+import "../chunk-FZIQSDTQ.js";
 import "../chunk-WLGEY4UX.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";