@pushary/agent-hooks 0.24.0 → 0.26.0

package/dist/bin/pushary-clean.js

@@ -8,7 +8,7 @@ import {
   removeCodexHooks,
   removeGeminiSettings,
   removeInstructionBlock
-} from "../chunk-JPRRYC5X.js";
+} from "../chunk-SLX4AONG.js";
 
 // bin/pushary-clean.ts
 import { existsSync, readFileSync, writeFileSync, rmSync } from "fs";

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

@@ -32,7 +32,7 @@ import {
   toCodexWire,
   toPolicyLookup,
   waitForAnswer
-} from "../chunk-OQZH5PVA.js";
+} from "../chunk-A7DQCA2N.js";
 import "../chunk-DWED7BS3.js";
 import {
   getApiKey

package/dist/bin/pushary-codex.js

@@ -4,7 +4,7 @@ import {
   getMachineId,
   reportEvent,
   waitForAnswer
-} from "../chunk-OQZH5PVA.js";
+} from "../chunk-A7DQCA2N.js";
 import "../chunk-DWED7BS3.js";
 import {
   getApiKey

package/dist/bin/pushary-doctor.js

@@ -7,8 +7,9 @@ import {
   hasInstructionBlock,
   missingCodexHookEvents,
   missingGeminiHookEvents,
+  readCodexMcpAuth,
   untrustedCodexHookEvents
-} from "../chunk-JPRRYC5X.js";
+} from "../chunk-SLX4AONG.js";
 import {
   callMcpTool,
   sendMcpRequest
@@ -171,22 +172,33 @@ var main = async () => {
     }
     const codexMcp = codexParsed.mcp_servers?.pushary;
     const codexTransport = !!codexMcp && (typeof codexMcp.url === "string" || typeof codexMcp.command === "string");
-    const codexEnvVar = codexMcp && typeof codexMcp.bearer_token_env_var === "string" ? codexMcp.bearer_token_env_var : void 0;
-    const codexHasCred = !!codexEnvVar || !!codexMcp && typeof codexMcp.bearer_token === "string";
-    const codexMcpOk = !!codexMcp && codexTransport && codexHasCred;
-    check(codexMcpOk, "Codex: MCP server configured", codexMcpOk ? void 0 : !codexMcp ? "no [mcp_servers.pushary] \u2014 re-run setup" : !codexTransport ? "entry has no url \u2014 `codex mcp add` likely failed, re-run setup" : "entry has no bearer_token/_env_var \u2014 re-run setup");
+    const codexAuth = readCodexMcpAuth(codexParsed);
+    const codexMcpOk = !!codexMcp && codexTransport && !!codexAuth;
+    check(codexMcpOk, "Codex: MCP server configured", codexMcpOk ? void 0 : !codexMcp ? "no [mcp_servers.pushary] \u2014 re-run setup" : !codexTransport ? "entry has no url \u2014 re-run setup" : "entry has no Authorization header or bearer token \u2014 re-run setup");
     if (codexMcp) {
       const hasAutoApprove = codexMcp.default_tools_approval_mode === "approve";
       check(hasAutoApprove, "Codex: tools auto-allowed", hasAutoApprove ? "default_tools_approval_mode = approve" : "missing \u2014 MCP calls will prompt for approval");
       if (codexMcp.tools && typeof codexMcp.tools === "object") {
         console.log(`  ${warn} Codex: per-tool approval overrides detected ${dim("(redundant with default_tools_approval_mode)")}`);
       }
-      if (codexEnvVar) {
-        const envValue = process.env[codexEnvVar]?.trim();
-        check(!!envValue, `Codex: MCP key available in shell ($${codexEnvVar})`, envValue ? "set" : `not set \u2014 Codex reads its key from your shell; the ~/.pushary/config.json fallback only covers hooks. Add the export to your profile or re-run setup`);
+      if (codexAuth?.method === "embedded") {
+        const keyMatches = !apiKey || codexAuth.key === apiKey;
+        check(keyMatches, "Codex: MCP key embedded (config.toml)", keyMatches ? "no shell export needed" : "differs from your active key \u2014 re-run setup");
+      } else if (codexAuth?.method === "env") {
+        const envValue = process.env[codexAuth.envVar]?.trim();
+        const exportedInProfile = SHELL_FILES.some((f) => {
+          try {
+            return readFileSync(f, "utf-8").includes(`export ${codexAuth.envVar}=`);
+          } catch {
+            return false;
+          }
+        });
+        check(!!envValue, `Codex: MCP key available in shell ($${codexAuth.envVar})`, envValue ? "set \u2014 re-run setup to embed the key and drop the shell dependency" : exportedInProfile ? "exported in your profile but not in this shell \u2014 restart the terminal, or re-run setup to embed the key in config.toml" : "not set \u2014 Codex reads its key from your shell; re-run setup to embed the key in config.toml");
         if (envValue && apiKey && envValue !== apiKey) {
-          console.log(`  ${warn} Codex: $${codexEnvVar} differs from your active key ${dim("(rotate or re-run setup so hooks and MCP match)")}`);
+          console.log(`  ${warn} Codex: $${codexAuth.envVar} differs from your active key ${dim("(rotate or re-run setup so hooks and MCP match)")}`);
         }
+      } else if (codexAuth?.method === "legacy-bearer") {
+        console.log(`  ${warn} Codex: legacy bearer_token entry ${dim("(re-run setup to embed the key as an Authorization header)")}`);
       }
     }
     const codexNotifyPath = codexConfig.match(/["']([^"']*pushary-codex[^"']*)["']/)?.[1] ?? null;

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

@@ -24,7 +24,7 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "../chunk-OQZH5PVA.js";
+} from "../chunk-A7DQCA2N.js";
 import "../chunk-DWED7BS3.js";
 import {
   getApiKey

package/dist/bin/pushary-hook.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import {
   handlePreToolUse
-} from "../chunk-U4SSWRVM.js";
+} from "../chunk-SA4BDS7T.js";
 import "../chunk-KQYIHZ5E.js";
-import "../chunk-OQZH5PVA.js";
+import "../chunk-A7DQCA2N.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-NKXSILEW.js";
 

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   handlePostToolUse
-} from "../chunk-OQZH5PVA.js";
+} from "../chunk-A7DQCA2N.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-NKXSILEW.js";
 

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   handleUserPrompt
-} from "../chunk-OQZH5PVA.js";
+} from "../chunk-A7DQCA2N.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-NKXSILEW.js";
 

package/dist/bin/pushary-setup.js

@@ -8,6 +8,7 @@ import {
   GEMINI_HOOK_BINARY,
   addCodexHookTrust,
   addCodexHooks,
+  addCodexMcpServer,
   addGeminiHooks,
   addGeminiMcpServer,
   execNpm,
@@ -15,11 +16,11 @@ import {
   renderAgentInstructions,
   renderProjectAgentInstructions,
   writeInstructionBlock
-} from "../chunk-JPRRYC5X.js";
+} from "../chunk-SLX4AONG.js";
 import {
   isValidApiKey,
   reportEvent
-} from "../chunk-OQZH5PVA.js";
+} from "../chunk-A7DQCA2N.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-NKXSILEW.js";
 
@@ -602,7 +603,7 @@ var addCodexNotifyEntry = (codexConfig) => {
     writeFileSync(codexConfig, stringifyTOML(config), "utf-8");
   }
 };
-var setupCodex = async (_apiKey) => {
+var setupCodex = async (apiKey) => {
   console.log(`
   ${bold2("Setting up Codex")}
 `);
@@ -613,28 +614,14 @@ var setupCodex = async (_apiKey) => {
   }
   await installGlobally();
   const codexConfig = join(homedir(), ".codex", "config.toml");
-  await spinner("Adding Pushary MCP server to Codex", async () => {
-    try {
-      execSync(
-        "codex mcp add pushary --url https://pushary.com/api/mcp/mcp --bearer-token-env-var PUSHARY_API_KEY",
-        { stdio: "ignore", timeout: 15e3 }
-      );
-    } catch {
-    }
-  });
-  await spinner("Auto-allowing all Pushary tools", async () => {
+  await spinner("Adding Pushary MCP server (key embedded, auto-allowed)", async () => {
     let raw = "";
     try {
       raw = readFileSync(codexConfig, "utf-8");
     } catch {
     }
     const config = raw ? parseTOML(raw) : {};
-    const mcpServers = config.mcp_servers ?? {};
-    const pushary = mcpServers.pushary ?? {};
-    pushary.default_tools_approval_mode = "approve";
-    delete pushary.tools;
-    mcpServers.pushary = pushary;
-    config.mcp_servers = mcpServers;
+    addCodexMcpServer(config, apiKey);
     writeFileSync(codexConfig, stringifyTOML(config), "utf-8");
   });
   const codexVersion = readCodexVersion();
@@ -681,6 +668,7 @@ var setupCodex = async (_apiKey) => {
   console.log();
   console.log(`  ${dim2("What this configured:")}`);
   console.log(`  ${dim2("\u2022")} MCP server: Codex can send notifications and ask questions`);
+  console.log(`  ${dim2("\u2022")} API key embedded in config.toml: works without a shell reload or export`);
   console.log(`  ${dim2("\u2022")} Proactive instructions: ~/.codex/AGENTS.md tells Codex to ask via push, not the terminal`);
   console.log(`  ${dim2("\u2022")} Auto-allowed tools: no permission prompts for Pushary MCP calls`);
   if (hooksSupported) {

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   handleStop
-} from "../chunk-OQZH5PVA.js";
+} from "../chunk-A7DQCA2N.js";
 import "../chunk-DWED7BS3.js";
 import "../chunk-NKXSILEW.js";
 

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

@@ -7,7 +7,7 @@ import {
   getBaseUrl
 } from "./chunk-NKXSILEW.js";
 
-// ../contracts/src/index.ts
+// ../../../../../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"];
@@ -156,6 +156,30 @@ 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) => {
@@ -334,16 +358,20 @@ var hookPrefixes = {
   Read: (input) => `read file: ${input.file_path ?? "(unknown path)"}`
 };
 var eventPrefixes = {
-  Bash: (input) => `ran: ${String(input.command ?? "").slice(0, 120)}`,
+  Bash: (input) => `ran: ${String(input.command ?? "")}`,
   Write: (input) => `wrote: ${input.file_path ?? "unknown"}`,
   Edit: (input) => `edited: ${input.file_path ?? "unknown"}`,
   Read: (input) => `read: ${input.file_path ?? "unknown"}`
 };
+var EVENT_ACTION_MAX = 120;
+var HOOK_FALLBACK_MAX = 200;
 var describeToolCall = (toolName, toolInput, format = "hook") => {
   const prefixes = format === "hook" ? hookPrefixes : eventPrefixes;
   const builder = prefixes[toolName];
-  if (builder) return builder(toolInput);
-  return format === "hook" ? `${toolName}: ${JSON.stringify(toolInput).slice(0, 200)}` : `${toolName}: done`;
+  const raw = builder ? builder(toolInput) : format === "hook" ? `${toolName}: ${JSON.stringify(toolInput)}` : `${toolName}: done`;
+  const redacted = redactSecrets(raw);
+  if (format === "event") return redacted.slice(0, EVENT_ACTION_MAX);
+  return builder ? redacted : redacted.slice(0, HOOK_FALLBACK_MAX);
 };
 var TOOL_TARGET_MAX_LENGTH = 80;
 var deriveCommandHead = (command) => {
@@ -405,20 +433,6 @@ var deriveReceiptMeta = (toolName, toolInput, toolResult, cwd) => {
   }
 };
 var firstString = (...values) => values.find((v) => typeof v === "string" && v.length > 0);
-var REDACTION_RULES = [
-  { pattern: /\bsk-[A-Za-z0-9]{20,}\b/g, replacement: "[redacted]" },
-  { pattern: /\bpk_(?:live|test)_[A-Za-z0-9]+\b/g, replacement: "[redacted]" },
-  { pattern: /\brk_[A-Za-z0-9]+\b/g, replacement: "[redacted]" },
-  { pattern: /\bAKIA[0-9A-Z]{16}\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|private[_-]?key)\s*[=:]\s*)(\S+)/gi,
-    replacement: "$1[redacted]"
-  },
-  { pattern: /[A-Za-z0-9+/]{40,}={0,2}/g, replacement: "[redacted]" }
-];
-var redactSecrets = (text) => REDACTION_RULES.reduce((acc, rule) => acc.replace(rule.pattern, rule.replacement), text);
 var ACTION_BODY_TRUNCATION_MARKER = "\n\u2026 [truncated]";
 var capActionBody = (text) => text.length <= ACTION_BODY_MAX ? text : `${text.slice(0, ACTION_BODY_MAX - ACTION_BODY_TRUNCATION_MARKER.length)}${ACTION_BODY_TRUNCATION_MARKER}`;
 var rawActionBody = (toolName, toolInput) => {
@@ -439,7 +453,7 @@ var deriveActionBody = (toolName, toolInput) => {
   try {
     const raw = rawActionBody(toolName, toolInput);
     if (!raw) return void 0;
-    return capActionBody(redactSecrets(raw));
+    return capActionBody(redactSecretsDeep(raw));
   } catch {
     return void 0;
   }

package/dist/{chunk-FGZZRCOG.js → chunk-SA4BDS7T.js}

@@ -19,7 +19,7 @@ import {
   savePendingQuestion,
   sendNotification,
   waitForAnswer
-} from "./chunk-M4GDBGXF.js";
+} from "./chunk-A7DQCA2N.js";
 import {
   getApiKey
 } from "./chunk-NKXSILEW.js";

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

@@ -25,6 +25,29 @@ var ensureRecord = (target, key) => {
   target[key] = created;
   return created;
 };
+var CODEX_MCP_URL = "https://pushary.com/api/mcp/mcp";
+var addCodexMcpServer = (config, apiKey) => {
+  const servers = ensureRecord(config, "mcp_servers");
+  const pushary = ensureRecord(servers, "pushary");
+  pushary.url = CODEX_MCP_URL;
+  ensureRecord(pushary, "http_headers").Authorization = `Bearer ${apiKey}`;
+  pushary.default_tools_approval_mode = "approve";
+  delete pushary.bearer_token_env_var;
+  delete pushary.tools;
+};
+var readCodexMcpAuth = (config) => {
+  const pushary = asRecord(asRecord(config.mcp_servers)?.pushary);
+  if (!pushary) return void 0;
+  const authorization = asRecord(pushary.http_headers)?.Authorization;
+  if (typeof authorization === "string" && authorization.startsWith("Bearer ")) {
+    return { method: "embedded", key: authorization.slice("Bearer ".length).trim() };
+  }
+  if (typeof pushary.bearer_token_env_var === "string") {
+    return { method: "env", envVar: pushary.bearer_token_env_var };
+  }
+  if (typeof pushary.bearer_token === "string") return { method: "legacy-bearer" };
+  return void 0;
+};
 var isPusharyCodexHook = (entry) => {
   const hooks = asRecord(entry)?.hooks;
   if (!Array.isArray(hooks)) return false;
@@ -306,6 +329,8 @@ var execNpm = (args, options = {}) => {
 };
 
 export {
+  addCodexMcpServer,
+  readCodexMcpAuth,
   addCodexHooks,
   removeCodexHooks,
   hasCodexHooks,

package/dist/src/index.js

@@ -1,6 +1,6 @@
 import {
   handlePreToolUse
-} from "../chunk-U4SSWRVM.js";
+} from "../chunk-SA4BDS7T.js";
 import "../chunk-KQYIHZ5E.js";
 import {
   askUser,
@@ -14,7 +14,7 @@ import {
   reportEvent,
   resolvePolicy,
   waitForAnswer
-} from "../chunk-OQZH5PVA.js";
+} from "../chunk-A7DQCA2N.js";
 import "../chunk-DWED7BS3.js";
 import {
   getApiKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushary/agent-hooks",
-  "version": "0.24.0",
+  "version": "0.26.0",
   "description": "Permission hooks for AI coding agents: route tool approvals through Pushary push notifications",
   "author": "Pushary <business@pushary.com>",
   "homepage": "https://pushary.com",