@pushary/agent-hooks 0.60.0 → 0.62.0

package/dist/bin/pushary-stats.js

@@ -1,13 +1,18 @@
 #!/usr/bin/env node
+import {
+  exitOnHelpFlag
+} from "../chunk-IIZZYUWK.js";
+import "../chunk-SP7OZXCQ.js";
 import {
   readLedgerSummary
 } from "../chunk-WLGEY4UX.js";
 import "../chunk-DQAN3JQP.js";
 import {
   getApiKey
-} from "../chunk-NKXSILEW.js";
+} from "../chunk-2UMNXADU.js";
 
 // bin/pushary-stats.ts
+exitOnHelpFlag("stats");
 var DAYS = 7;
 var summary = readLedgerSummary(DAYS);
 var connected = true;

package/dist/bin/pushary-status.d.ts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/bin/pushary-status.js

@@ -0,0 +1,206 @@
+#!/usr/bin/env node
+import {
+  describeReach,
+  fetchChannels,
+  reachVerdict
+} from "../chunk-3O27ZSRE.js";
+import "../chunk-3EGEA4KH.js";
+import {
+  readKeySource
+} from "../chunk-247C4RE5.js";
+import {
+  checkApiKey,
+  describeKeyCheck
+} from "../chunk-YJ7YZRVV.js";
+import {
+  createIo
+} from "../chunk-TX7KBKT7.js";
+import "../chunk-7QLSKOSU.js";
+import "../chunk-BC3VCZ3E.js";
+import {
+  exitOnHelpFlag
+} from "../chunk-IIZZYUWK.js";
+import {
+  EXIT
+} from "../chunk-SP7OZXCQ.js";
+import "../chunk-HNTKTK5B.js";
+import "../chunk-DQAN3JQP.js";
+import "../chunk-2UMNXADU.js";
+
+// src/status.ts
+var keySourceLine = (source) => {
+  if (source.kind === "none") {
+    return { label: "Key", value: "none found", ok: false };
+  }
+  const prefix = source.key ? source.key.split(".")[0] : "unknown";
+  const where = source.kind === "env" ? "$PUSHARY_API_KEY" : source.origin ?? "config file";
+  return { label: "Key", value: `${prefix} from ${where}`, ok: true };
+};
+var reachLine = (channels) => {
+  const verdict = reachVerdict(channels);
+  const line = describeReach(channels);
+  if (verdict.kind === "nobody") return { label: "Reachable", value: line, ok: false };
+  if (verdict.kind === "yours") {
+    const inPocket = (channels.yours?.phoneReachable ?? channels.phoneReachable) || channels.webPhone > 0;
+    return { label: "Reachable", value: line, ok: inPocket };
+  }
+  return { label: "Reachable", value: line, ok: false };
+};
+var siteLine = (channels) => {
+  const site = channels.site;
+  if (site === null || site.otherMembers === 0) return null;
+  const devices = site.appDevices + site.webActive;
+  return {
+    label: "Team",
+    value: `${devices} device${devices === 1 ? "" : "s"} across ${site.otherMembers + 1} members`,
+    ok: null
+  };
+};
+var buildStatusReport = (facts) => {
+  const lines = [keySourceLine(facts.source)];
+  if (facts.source.drift) {
+    lines.push({
+      label: "Key drift",
+      value: `$PUSHARY_API_KEY (${facts.source.drift.envPrefix}) differs from ${facts.source.drift.configPath} (${facts.source.drift.configPrefix}); the environment wins`,
+      ok: false
+    });
+  }
+  if (facts.source.kind === "none") {
+    return {
+      lines,
+      headline: "Not set up on this machine.",
+      next: ["Run `pushary setup` to connect an agent."],
+      exitCode: EXIT.NOT_CONFIGURED
+    };
+  }
+  const check = facts.keyCheck;
+  if (check && check.kind !== "ok") {
+    const report = describeKeyCheck(check);
+    lines.push({ label: "Server", value: report.message, ok: check.kind === "unreachable" ? null : false });
+    return { lines, headline: report.message, next: [...report.next], exitCode: report.exitCode };
+  }
+  if (check?.kind === "ok") {
+    const id = check.identity;
+    lines.push({ label: "Site", value: `${id.siteName || id.siteSlug} (${id.siteSlug})`, ok: true });
+    lines.push({
+      label: "Plan",
+      value: id.plan === id.surfacePlan ? `${id.plan} \xB7 ${id.subscriptionStatus}` : `${id.plan} (from ${id.surfacePlan}) \xB7 ${id.subscriptionStatus}`,
+      ok: true
+    });
+    if (id.workspaceMembers > 1) {
+      lines.push({
+        label: "Workspace",
+        value: `${id.workspaceMembers} members \u2014 some devices below may not be yours`,
+        ok: null
+      });
+    }
+  }
+  const channels = facts.channels?.kind === "ok" ? facts.channels.status : null;
+  if (channels) {
+    lines.push(reachLine(channels));
+    const site = siteLine(channels);
+    if (site) lines.push(site);
+  } else if (facts.channels && facts.channels.kind === "unreachable") {
+    lines.push({ label: "Reachable", value: `could not check (${facts.channels.detail})`, ok: null });
+  }
+  if (facts.source.drift) {
+    return {
+      lines,
+      headline: "Working, but two different keys are configured.",
+      next: [
+        "The shell export wins over the config file, and it may be the older one.",
+        "Run `pushary setup` to line them up, or open a new terminal."
+      ],
+      exitCode: EXIT.PROBLEMS_FOUND
+    };
+  }
+  if (facts.channels && facts.channels.kind === "unreachable") {
+    return {
+      lines,
+      headline: "Key is fine; could not read which devices are connected.",
+      next: ["Run `pushary status` again in a minute."],
+      exitCode: EXIT.UNREACHABLE
+    };
+  }
+  if (channels) {
+    const verdict = reachVerdict(channels);
+    if (verdict.kind !== "yours") {
+      return {
+        lines,
+        headline: verdict.kind === "nobody" ? "Configured, but no device can receive an approval." : verdict.kind === "others" ? "Configured, but the only devices here are your teammates'." : "Configured, and nothing proves an approval reaches you.",
+        next: verdict.kind === "nobody" ? ["Run `pushary connect` to add your phone, or install the Pushary app."] : ["Run `pushary connect` to add your own phone.", "Or `pushary doctor --roundtrip` to prove one of these is yours."],
+        exitCode: EXIT.NO_DEVICE
+      };
+    }
+    if (!(channels.yours?.phoneReachable ?? channels.phoneReachable) && channels.webPhone === 0) {
+      return {
+        lines,
+        headline: "Configured, but nothing in your pocket can receive an approval.",
+        next: ["Run `pushary connect` and connect your phone, or install the Pushary app."],
+        exitCode: EXIT.NO_DEVICE
+      };
+    }
+  }
+  return {
+    lines,
+    headline: "Ready.",
+    next: [],
+    exitCode: EXIT.OK
+  };
+};
+var statusJson = (facts, report) => ({
+  ok: report.exitCode === EXIT.OK,
+  headline: report.headline,
+  exitCode: report.exitCode,
+  keySource: facts.source.kind,
+  keyOrigin: facts.source.origin,
+  keyPrefix: facts.source.key ? facts.source.key.split(".")[0] : null,
+  drift: facts.source.drift ? {
+    env: facts.source.drift.envPrefix,
+    config: facts.source.drift.configPrefix,
+    configPath: facts.source.drift.configPath
+  } : null,
+  keyCheck: facts.keyCheck?.kind ?? null,
+  identity: facts.keyCheck?.kind === "ok" ? facts.keyCheck.identity : null,
+  channels: facts.channels?.kind === "ok" ? facts.channels.status : null,
+  channelsProbe: facts.channels?.kind ?? null
+});
+
+// bin/pushary-status.ts
+exitOnHelpFlag("status");
+var { bold, dim, green, red, yellow } = createIo();
+var args = process.argv.slice(2);
+var json = args.includes("--json");
+var main = async () => {
+  const source = readKeySource();
+  let keyCheck = null;
+  let channels = null;
+  if (source.key) {
+    keyCheck = await checkApiKey(source.key);
+    if (keyCheck.kind === "ok") channels = await fetchChannels(source.key);
+  }
+  const facts = { source, keyCheck, channels };
+  const report = buildStatusReport(facts);
+  if (json) {
+    process.stdout.write(`${JSON.stringify(statusJson(facts, report), null, 2)}
+`);
+    process.exit(report.exitCode);
+  }
+  const width = Math.max(...report.lines.map((line) => line.label.length)) + 2;
+  console.log();
+  console.log(`  ${bold("Pushary")}`);
+  console.log();
+  for (const line of report.lines) {
+    const icon = line.ok === true ? green("\u2713") : line.ok === false ? red("\u2717") : dim("\xB7");
+    console.log(`  ${icon} ${line.label.padEnd(width)}${line.value}`);
+  }
+  console.log();
+  console.log(`  ${report.exitCode === 0 ? green(bold(report.headline)) : yellow(bold(report.headline))}`);
+  for (const next of report.next) console.log(`  ${dim(next)}`);
+  console.log();
+  process.exit(report.exitCode);
+};
+main().catch((err) => {
+  console.error(`  ${yellow("!")} status failed: ${err instanceof Error ? err.message : String(err)}`);
+  process.exit(1);
+});

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

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   handleStop
-} from "../chunk-WNRYRN2R.js";
-import "../chunk-RN3NOEJF.js";
-import "../chunk-DWED7BS3.js";
+} from "../chunk-HIIBSYFJ.js";
+import "../chunk-HNTKTK5B.js";
 import "../chunk-DQAN3JQP.js";
-import "../chunk-NKXSILEW.js";
+import "../chunk-RN3NOEJF.js";
+import "../chunk-2UMNXADU.js";
 
 // bin/pushary-stop-hook.ts
 var main = async () => {

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

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   handleStopFailure
-} from "../chunk-WNRYRN2R.js";
-import "../chunk-RN3NOEJF.js";
-import "../chunk-DWED7BS3.js";
+} from "../chunk-HIIBSYFJ.js";
+import "../chunk-HNTKTK5B.js";
 import "../chunk-DQAN3JQP.js";
-import "../chunk-NKXSILEW.js";
+import "../chunk-RN3NOEJF.js";
+import "../chunk-2UMNXADU.js";
 
 // bin/pushary-stopfailure-hook.ts
 var main = async () => {

package/dist/bin/pushary-suggestions.js

@@ -1,14 +1,19 @@
 #!/usr/bin/env node
+import {
+  createIo
+} from "../chunk-TX7KBKT7.js";
+import {
+  exitOnHelpFlag
+} from "../chunk-IIZZYUWK.js";
+import "../chunk-SP7OZXCQ.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-NKXSILEW.js";
+} from "../chunk-2UMNXADU.js";
 
 // bin/pushary-suggestions.ts
-var dim = (s) => `\x1B[2m${s}\x1B[0m`;
-var green = (s) => `\x1B[32m${s}\x1B[0m`;
-var cyan = (s) => `\x1B[36m${s}\x1B[0m`;
-var red = (s) => `\x1B[31m${s}\x1B[0m`;
+exitOnHelpFlag("suggestions");
+var { dim, green, cyan, red } = createIo();
 var errorMessage = async (res) => {
   try {
     const body = await res.json();

package/dist/bin/pushary-upgrade.js

@@ -1,23 +1,50 @@
 #!/usr/bin/env node
-import {
-  execNpm,
-  npmErrorMessage,
-  resolveGlobalBinDir
-} from "../chunk-J7JWI3KU.js";
 import {
   addClaudeMcpServer,
   addPusharyHooks,
   addPusharyToolPermissions
 } from "../chunk-CAJZAFVS.js";
+import {
+  GEMINI_HOOK_BINARY,
+  addGeminiHooks,
+  addGeminiMcpServer,
+  hasGeminiHooks
+} from "../chunk-E2U35RLD.js";
+import {
+  CODEX_HOOK_BINARY,
+  addCodexHookTrust,
+  addCodexHooks,
+  addCodexMcpServer,
+  codexConfigToml,
+  codexHooksJson,
+  hasCodexHooks
+} from "../chunk-ER657KRJ.js";
+import {
+  execNpm,
+  npmErrorMessage,
+  quoteIfNeeded,
+  resolveGlobalBinDir,
+  resolveGlobalBinary
+} from "../chunk-MUEW424A.js";
+import {
+  exitOnHelpFlag
+} from "../chunk-IIZZYUWK.js";
+import "../chunk-SP7OZXCQ.js";
 import "../chunk-DQAN3JQP.js";
 import {
   getApiKey
-} from "../chunk-NKXSILEW.js";
+} from "../chunk-2UMNXADU.js";
+
+// bin/pushary-upgrade.ts
+import { existsSync as existsSync2 } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
 
 // src/reapply.ts
 import { join, dirname } from "path";
 import { homedir } from "os";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { parse as parseTOML, stringify as stringifyTOML } from "smol-toml";
 var CLAUDE_SETTINGS = join(homedir(), ".claude", "settings.json");
 var CLAUDE_JSON = join(homedir(), ".claude.json");
 var readJson = (filePath) => {
@@ -62,8 +89,130 @@ var reapplyClaudeSettings = (apiKey, paths = {}) => {
   }
   return { reapplied: hooks || mcp, hooks, mcp };
 };
+var readToml = (filePath) => {
+  try {
+    const raw = readFileSync(filePath, "utf-8");
+    return raw.trim() === "" ? {} : parseTOML(raw);
+  } catch {
+    return null;
+  }
+};
+var reapplyCodexSettings = (apiKey, paths = {}) => {
+  const configPath = paths.configPath ?? codexConfigToml();
+  const hooksPath = paths.hooksPath ?? codexHooksJson();
+  const config = readToml(configPath);
+  const hooksConfig = readJson(hooksPath);
+  const configured = config != null && !!config.mcp_servers?.pushary || hooksConfig != null && hasCodexHooks(hooksConfig);
+  if (!configured) return { reapplied: false, hooks: false, mcp: false };
+  const command = quoteIfNeeded(resolveGlobalBinary(CODEX_HOOK_BINARY) ?? CODEX_HOOK_BINARY);
+  let hooks = false;
+  let mcp = false;
+  if (hooksConfig != null) {
+    try {
+      addCodexHooks(hooksConfig, command);
+      writeJson(hooksPath, hooksConfig);
+      hooks = true;
+    } catch {
+    }
+  }
+  if (config != null) {
+    try {
+      if (hooks) addCodexHookTrust(config, hooksPath, command);
+      if (apiKey) {
+        addCodexMcpServer(config, apiKey);
+        mcp = true;
+      }
+      if (hooks || apiKey) writeFileSync(configPath, stringifyTOML(config), "utf-8");
+    } catch {
+    }
+  }
+  return { reapplied: hooks || mcp, hooks, mcp };
+};
+var reapplyGeminiSettings = (apiKey, paths = {}) => {
+  const settingsPath = paths.settingsPath ?? join(homedir(), ".gemini", "settings.json");
+  const settings = readJson(settingsPath);
+  if (settings == null) return { reapplied: false, hooks: false, mcp: false };
+  const configured = hasGeminiHooks(settings) || !!settings.mcpServers?.pushary;
+  if (!configured) return { reapplied: false, hooks: false, mcp: false };
+  let hooks = false;
+  let mcp = false;
+  try {
+    addGeminiHooks(settings, quoteIfNeeded(resolveGlobalBinary(GEMINI_HOOK_BINARY) ?? GEMINI_HOOK_BINARY));
+    hooks = true;
+    if (apiKey) {
+      addGeminiMcpServer(settings, apiKey);
+      mcp = true;
+    }
+    writeJson(settingsPath, settings);
+  } catch {
+  }
+  return { reapplied: hooks || mcp, hooks, mcp };
+};
+var reapplyCursorPlugin = (apiKey, paths = {}) => {
+  const mcpPath = paths.pluginMcpPath ?? join(homedir(), ".cursor", "plugins", "local", "pushary", "mcp.json");
+  if (!apiKey) return { reapplied: false, hooks: false, mcp: false };
+  const mcpConfig = readJson(mcpPath);
+  if (mcpConfig == null) return { reapplied: false, hooks: false, mcp: false };
+  const servers = mcpConfig.mcpServers;
+  if (!servers?.pushary) return { reapplied: false, hooks: false, mcp: false };
+  try {
+    addClaudeMcpServer(mcpConfig, apiKey);
+    writeJson(mcpPath, mcpConfig);
+    return { reapplied: true, hooks: false, mcp: true };
+  } catch {
+    return { reapplied: false, hooks: false, mcp: false };
+  }
+};
+var reapplyAllAgents = (apiKey) => {
+  const runners = [
+    { label: "Claude Code", run: () => reapplyClaudeSettings(apiKey) },
+    { label: "Codex", run: () => reapplyCodexSettings(apiKey) },
+    { label: "Gemini CLI", run: () => reapplyGeminiSettings(apiKey) },
+    { label: "Cursor", run: () => reapplyCursorPlugin(apiKey) }
+  ];
+  const done = [];
+  for (const runner of runners) {
+    try {
+      const result = runner.run();
+      if (result.reapplied) done.push({ label: runner.label, result });
+    } catch {
+    }
+  }
+  return done;
+};
 
 // bin/pushary-upgrade.ts
+exitOnHelpFlag("upgrade");
+var detectInstallModes = () => {
+  const candidates = [
+    {
+      label: "Cursor plugin",
+      upgrade: "updates itself through Cursor",
+      present: existsSync2(join2(homedir2(), ".cursor", "plugins", "local", "pushary"))
+    },
+    {
+      label: "Codex config",
+      upgrade: "npx @pushary/agent-hooks@latest setup --agents codex",
+      present: existsSync2(codexConfigToml())
+    },
+    {
+      label: "Claude Code config",
+      upgrade: "npx @pushary/agent-hooks@latest setup --agents claude_code",
+      present: existsSync2(join2(homedir2(), ".claude.json"))
+    },
+    {
+      label: "Gemini config",
+      upgrade: "npx @pushary/agent-hooks@latest setup --agents gemini_cli",
+      present: existsSync2(join2(homedir2(), ".gemini", "settings.json"))
+    },
+    {
+      label: "Hermes plugin (pip)",
+      upgrade: "pip install --upgrade pushary-hermes",
+      present: existsSync2(join2(homedir2(), ".hermes"))
+    }
+  ];
+  return candidates.filter((candidate) => candidate.present).map(({ label, upgrade }) => ({ label, upgrade }));
+};
 var getInstalledVersion = () => {
   try {
     return execNpm("list -g --no-workspaces @pushary/agent-hooks --depth=0", { timeout: 1e4 }).toString().match(/@pushary\/agent-hooks@([\d.]+)/)?.[1] ?? "";
@@ -95,8 +244,20 @@ var isNewer = (a, b) => {
 var main = async () => {
   const installed = getInstalledVersion();
   if (!installed) {
-    console.log("No global install of @pushary/agent-hooks found, so there is nothing to upgrade.");
-    console.log("Plugin installs update on their own. To set up the CLI hooks: npx @pushary/agent-hooks@latest setup");
+    const found = detectInstallModes();
+    console.log("No global install of @pushary/agent-hooks found, so there is nothing to upgrade here.");
+    console.log();
+    if (found.length === 0) {
+      console.log("Nothing on this machine looks Pushary-configured either.");
+      console.log("  Set it up with:  npx @pushary/agent-hooks@latest setup");
+    } else {
+      console.log("What this machine does have:");
+      for (const mode of found) {
+        console.log(`  ${mode.label.padEnd(22)} ${mode.upgrade}`);
+      }
+    }
+    console.log();
+    console.log("Check the result with: pushary doctor");
     return;
   }
   const latest = await fetchLatestVersion();
@@ -117,14 +278,23 @@ var main = async () => {
   } catch {
     apiKey = void 0;
   }
-  try {
-    const result = reapplyClaudeSettings(apiKey);
-    if (result.reapplied) {
-      console.log("Refreshed Claude Code hooks and settings so the new hook set is active now.");
+  const refreshed = reapplyAllAgents(apiKey);
+  console.log();
+  if (refreshed.length > 0) {
+    console.log("Refreshed so the new hook set is active now:");
+    for (const agent of refreshed) {
+      const parts = [agent.result.hooks ? "hooks" : null, agent.result.mcp ? "MCP key" : null].filter(Boolean).join(" + ");
+      console.log(`  ${agent.label.padEnd(14)} ${parts}`);
     }
-  } catch {
+    if (!apiKey) {
+      console.log();
+      console.log("No key was readable here, so MCP entries kept the key they already had.");
+    }
+  } else {
+    console.log("No agent config on this machine needed refreshing.");
   }
-  console.log("Done. Your hooks point at the global install and settings were refreshed.");
+  console.log();
+  console.log("Done. Your hooks point at the global install.");
   console.log("Verify with: pushary doctor");
 };
 main();

package/dist/bin/pushary-wait.js

@@ -1,18 +1,30 @@
 #!/usr/bin/env node
+import {
+  exitOnFailedResponse
+} from "../chunk-ONVEYEVR.js";
 import {
   describeWaitLadder
 } from "../chunk-IIENZE2J.js";
+import "../chunk-YJ7YZRVV.js";
+import {
+  createIo
+} from "../chunk-TX7KBKT7.js";
+import "../chunk-7QLSKOSU.js";
+import {
+  exitOnHelpFlag
+} from "../chunk-IIZZYUWK.js";
+import {
+  EXIT
+} from "../chunk-SP7OZXCQ.js";
+import "../chunk-DQAN3JQP.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-NKXSILEW.js";
+} from "../chunk-2UMNXADU.js";
 
 // bin/pushary-wait.ts
-var dim = (s) => `\x1B[2m${s}\x1B[0m`;
-var bold = (s) => `\x1B[1m${s}\x1B[0m`;
-var green = (s) => `\x1B[32m${s}\x1B[0m`;
-var cyan = (s) => `\x1B[36m${s}\x1B[0m`;
-var yellow = (s) => `\x1B[33m${s}\x1B[0m`;
+exitOnHelpFlag("wait");
+var { dim, bold, green, cyan, yellow } = createIo();
 var MAX_WINDOW = 300;
 var printLadder = (data) => {
   console.log();
@@ -36,7 +48,7 @@ var printLadder = (data) => {
 };
 var fetchPolicy = async (baseUrl, headers) => {
   const res = await fetch(`${baseUrl}/api/mcp/policy`, { headers });
-  if (!res.ok) throw new Error(`policy fetch failed (${res.status})`);
+  if (!res.ok) await exitOnFailedResponse(res, baseUrl);
   return res.json();
 };
 var setWindow = async (baseUrl, headers, seconds) => {
@@ -45,10 +57,7 @@ var setWindow = async (baseUrl, headers, seconds) => {
     headers,
     body: JSON.stringify({ defaultPushFirstSeconds: seconds })
   });
-  if (!res.ok) {
-    const err = await res.json().catch(() => ({}));
-    throw new Error(err.error ?? res.statusText);
-  }
+  if (!res.ok) await exitOnFailedResponse(res, baseUrl);
   const data = await res.json();
   return data.defaultPushFirstSeconds;
 };
@@ -75,7 +84,7 @@ var main = async () => {
   if (!Number.isFinite(seconds) || seconds < 0 || seconds > MAX_WINDOW) {
     console.log(`  ${yellow("!")} Invalid window: ${arg} ${dim(`(use 0-${MAX_WINDOW} seconds, or "status" / "clear")`)}`);
     console.log(`  ${dim("Usage: pushary wait <seconds> | status | clear")}`);
-    return;
+    process.exit(EXIT.USAGE);
   }
   const value = await setWindow(baseUrl, headers, Math.trunc(seconds));
   console.log(`  ${green("\u2713")} Default push window set to ${cyan(`${value}s`)} ${dim("\u2014 ping your phone that long, then the terminal takes over")}`);