@pushary/agent-hooks 0.61.0 → 0.62.0

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## 0.62.0
+
+### `pushary clean` could leave your API key on disk
+
+If `CODEX_HOME` was set, `clean` looked for Codex's `config.toml` in `~/.codex`
+and never found the real one. It printed `Codex config (not found)`, exited `0`,
+and left the key in the file. A user who ran `clean` to remove their key was told
+it had worked.
+
+The same fault ran through the rest of the Codex path. With `CODEX_HOME` set:
+
+- `setup` wrote the MCP server, the trust hashes and the notify entry to
+  `~/.codex/config.toml` while writing `hooks.json`, `AGENTS.md` and the skill to
+  the real `CODEX_HOME`, splitting the install across two directories
+- `setup --dry-run` named the relocated path, so the preview and the real run
+  disagreed about where the key would land
+- `doctor` read the relocated config and reported the key missing
+- `logout` treated an exported-but-empty `CODEX_HOME` as a path relative to the
+  current directory
+
+If you use `CODEX_HOME`, run `pushary clean --dry-run` to see what is still
+there, and check `$CODEX_HOME/config.toml` for a key you thought was gone.
+
+### New
+
+- `pushary clean --dry-run` lists everything it would remove and changes nothing
+- `pushary doctor --bundle` writes a redacted diagnostics file for a support
+  thread. Keys, your home directory and the machine name are stripped.
+- `pushary logout --revoke` kills the key server-side as well as locally, so it
+  stops working everywhere rather than only on this machine
+
+### Changed
+
+- `pushary upgrade` now refreshes Codex, Gemini CLI and Cursor, not only Claude
+  Code, and names the agents it actually touched. It matters most for Codex,
+  whose hooks are trusted by hash: a refreshed hook command without a refreshed
+  trust entry is a hook Codex silently declines to run.
+- `pushary upgrade` with no global install now names the install modes it can
+  see and the command that updates each, instead of one generic line and exit 0
+- `pushary daemon` stops on a rejected key or a closed plan and exits `4`
+  (`UNAUTHENTICATED`). It used to treat that like a network blip, back off to a
+  two-minute poll and sit there under an `online` banner, so a revoked key left a
+  daemon that looked healthy and would never launch anything again.
+- Ctrl-C during app pairing now cancels the pairing on the server, so a QR still
+  on your screen stops being claimable immediately instead of staying live for
+  the rest of its five minutes
+- `setup` prints the command surface when it finishes
+
 ## 0.61.0
 
 The largest release since the CLI shipped. Setup no longer asks you to paste an

package/dist/bin/pushary-claude.js

@@ -17,14 +17,14 @@ import {
   reportEvent,
   resolvePolicy,
   waitForAnswer
-} from "../chunk-VFBYRR2N.js";
-import {
-  getMachineId
-} from "../chunk-RN3NOEJF.js";
+} from "../chunk-HIIBSYFJ.js";
 import "../chunk-HNTKTK5B.js";
 import {
   redactSecrets
 } from "../chunk-DQAN3JQP.js";
+import {
+  getMachineId
+} from "../chunk-RN3NOEJF.js";
 import {
   getApiKey,
   getBaseUrl

package/dist/bin/pushary-clean.js

@@ -4,10 +4,18 @@ import {
   removePusharySettings
 } from "../chunk-CAJZAFVS.js";
 import {
-  removeCodexHooks,
-  removeGeminiSettings,
   removeInstructionBlock
-} from "../chunk-S4TFBJ5O.js";
+} from "../chunk-N7XJ4L2W.js";
+import {
+  removeGeminiSettings
+} from "../chunk-E2U35RLD.js";
+import {
+  codexAgentsMd,
+  codexConfigToml,
+  codexHooksJson,
+  codexSkillDir,
+  removeCodexHooks
+} from "../chunk-ER657KRJ.js";
 import {
   removeClaudeAlias
 } from "../chunk-BC3VCZ3E.js";
@@ -16,8 +24,8 @@ import {
 } from "../chunk-MUEW424A.js";
 import {
   exitOnHelpFlag
-} from "../chunk-HUJQSP4F.js";
-import "../chunk-SML23YOT.js";
+} from "../chunk-IIZZYUWK.js";
+import "../chunk-SP7OZXCQ.js";
 import "../chunk-DQAN3JQP.js";
 
 // bin/pushary-clean.ts
@@ -66,8 +74,25 @@ var readJson = (path) => {
     return null;
   }
 };
+var dryRun = false;
+var did = (past) => dryRun ? `(would ${past === "cleaned" ? "clean" : past === "removed" ? "remove" : past === "uninstalled" ? "uninstall" : past})` : `(${past})`;
+var wouldNote = (action, path) => {
+  console.log(`  ${dim("would")} ${action} ${path}`);
+};
+var guardedWrite = (path, contents) => {
+  if (dryRun) return wouldNote("rewrite", path);
+  writeFileSync(path, contents, "utf-8");
+};
+var guardedRemove = (path, options = {}) => {
+  if (dryRun) return wouldNote("remove ", path);
+  rmSync(path, { recursive: true, force: options.force });
+};
+var guardedExec = (command, options, describe) => {
+  if (dryRun) return wouldNote("run    ", describe);
+  execSync(command, options);
+};
 var writeJson = (path, data) => {
-  writeFileSync(path, JSON.stringify(data, null, 2) + "\n", "utf-8");
+  guardedWrite(path, JSON.stringify(data, null, 2) + "\n");
 };
 var cleanSettingsFile = (path, label) => {
   const data = readJson(path);
@@ -78,7 +103,7 @@ var cleanSettingsFile = (path, label) => {
   const changed = removePusharySettings(data);
   if (changed) {
     writeJson(path, data);
-    console.log(`  ${check} ${label} ${dim("(cleaned)")}`);
+    console.log(`  ${check} ${label} ${dim(did("cleaned"))}`);
   } else {
     console.log(`  ${skip} ${label} ${dim("(no pushary entries)")}`);
   }
@@ -88,7 +113,12 @@ var main = async () => {
   console.log(`  ${bold("Pushary Clean")}`);
   console.log(`  ${dim("Removes all Pushary configuration")}`);
   console.log();
-  const assumeYes = process.argv.includes("--yes") || process.argv.includes("-y");
+  dryRun = process.argv.includes("--dry-run");
+  if (dryRun) {
+    console.log(`  ${bold("Dry run")} ${dim("- nothing will be changed")}`);
+    console.log();
+  }
+  const assumeYes = dryRun || process.argv.includes("--yes") || process.argv.includes("-y");
   if (!assumeYes && !process.stdin.isTTY) {
     console.log(`  ${yellow("!")} Non-interactive shell. Re-run with --yes to confirm removal.`);
     process.exit(1);
@@ -118,7 +148,7 @@ var main = async () => {
     if (mcpServers?.pushary) {
       delete mcpServers.pushary;
       writeJson(CURSOR_MCP, cursorData);
-      console.log(`  ${check} Cursor MCP config ${dim("(cleaned)")}`);
+      console.log(`  ${check} Cursor MCP config ${dim(did("cleaned"))}`);
     } else {
       console.log(`  ${skip} Cursor MCP config ${dim("(no pushary entries)")}`);
     }
@@ -126,7 +156,7 @@ var main = async () => {
     console.log(`  ${skip} Cursor MCP config ${dim("(not found)")}`);
   }
   if (existsSync(CURSOR_PLUGIN_DIR)) {
-    rmSync(CURSOR_PLUGIN_DIR, { recursive: true });
+    guardedRemove(CURSOR_PLUGIN_DIR);
     console.log(`  ${check} Cursor plugin ${dim("(removed from ~/.cursor/plugins/local)")}`);
   } else {
     console.log(`  ${skip} Cursor plugin ${dim("(not installed)")}`);
@@ -149,12 +179,12 @@ var main = async () => {
     console.log(`  ${skip} Cursor gate ${dim("(no hooks.json)")}`);
   }
   if (existsSync(SKILL_DIR)) {
-    rmSync(SKILL_DIR, { recursive: true });
-    console.log(`  ${check} Skill directory ${dim("(removed)")}`);
+    guardedRemove(SKILL_DIR);
+    console.log(`  ${check} Skill directory ${dim(did("removed"))}`);
   } else {
     console.log(`  ${skip} Skill directory ${dim("(not found)")}`);
   }
-  const codexConfig = join(homedir(), ".codex", "config.toml");
+  const codexConfig = codexConfigToml();
   try {
     const config = readFileSync(codexConfig, "utf-8");
     const hadPushary = config.includes("pushary");
@@ -168,19 +198,19 @@ var main = async () => {
         parsed.notify = parsed.notify.filter((n) => typeof n !== "string" || !n.includes("pushary-codex"));
         if (parsed.notify.length === 0) delete parsed.notify;
       }
-      writeFileSync(codexConfig, stringifyTOML(parsed), "utf-8");
-      console.log(`  ${check} Codex config ${dim("(cleaned)")}`);
+      guardedWrite(codexConfig, stringifyTOML(parsed));
+      console.log(`  ${check} Codex config ${dim(did("cleaned"))}`);
     } else {
       console.log(`  ${skip} Codex config ${dim("(no pushary entries)")}`);
     }
   } catch {
     console.log(`  ${skip} Codex config ${dim("(not found)")}`);
   }
-  const codexHooksJson = join(homedir(), ".codex", "hooks.json");
-  const codexHooksData = readJson(codexHooksJson);
+  const codexHooksJson2 = codexHooksJson();
+  const codexHooksData = readJson(codexHooksJson2);
   if (codexHooksData) {
     if (removeCodexHooks(codexHooksData)) {
-      writeJson(codexHooksJson, codexHooksData);
+      writeJson(codexHooksJson2, codexHooksData);
       console.log(`  ${check} Codex hooks ${dim("(removed from ~/.codex/hooks.json)")}`);
     } else {
       console.log(`  ${skip} Codex hooks ${dim("(no pushary entries)")}`);
@@ -188,16 +218,16 @@ var main = async () => {
   } else {
     console.log(`  ${skip} Codex hooks ${dim("(not found)")}`);
   }
-  const codexAgentsMd = join(homedir(), ".codex", "AGENTS.md");
-  if (removeInstructionBlock(codexAgentsMd)) {
+  const codexAgentsMd2 = codexAgentsMd();
+  if (removeInstructionBlock(codexAgentsMd2)) {
     console.log(`  ${check} Codex AGENTS.md ${dim("(removed Pushary block)")}`);
   } else {
     console.log(`  ${skip} Codex AGENTS.md ${dim("(no pushary block)")}`);
   }
-  const codexSkillDir = join(homedir(), ".codex", "skills", "pushary");
-  if (existsSync(codexSkillDir)) {
-    rmSync(codexSkillDir, { recursive: true });
-    console.log(`  ${check} Codex skill directory ${dim("(removed)")}`);
+  const codexSkillDir2 = codexSkillDir();
+  if (existsSync(codexSkillDir2)) {
+    guardedRemove(codexSkillDir2);
+    console.log(`  ${check} Codex skill directory ${dim(did("removed"))}`);
   } else {
     console.log(`  ${skip} Codex skill directory ${dim("(not found)")}`);
   }
@@ -206,7 +236,7 @@ var main = async () => {
   if (geminiSettings) {
     if (removeGeminiSettings(geminiSettings)) {
       writeJson(geminiSettingsPath, geminiSettings);
-      console.log(`  ${check} Gemini CLI settings ${dim("(cleaned)")}`);
+      console.log(`  ${check} Gemini CLI settings ${dim(did("cleaned"))}`);
     } else {
       console.log(`  ${skip} Gemini CLI settings ${dim("(no pushary entries)")}`);
     }
@@ -223,13 +253,13 @@ var main = async () => {
   if (hermesPython) {
     const snippet = 'from hermes_cli.config import load_config, save_config; c = load_config(); p = c.get("plugins") if isinstance(c.get("plugins"), dict) else {}; e = p.get("enabled") if isinstance(p.get("enabled"), list) else []; p["enabled"] = [x for x in e if x != "pushary"]; c["plugins"] = p; a = c.get("agent") if isinstance(c.get("agent"), dict) else {}; d = a.get("disabled_toolsets") if isinstance(a.get("disabled_toolsets"), list) else []; a["disabled_toolsets"] = [x for x in d if x != "clarify"]; c["agent"] = a; save_config(c)';
     try {
-      execSync(`"${hermesPython}" -c '${snippet}'`, { stdio: "pipe", timeout: 15e3 });
+      guardedExec(`"${hermesPython}" -c '${snippet}'`, { stdio: "pipe", timeout: 15e3 }, "hermes plugin config update");
       console.log(`  ${check} Hermes config ${dim("(plugin disabled, clarify toolset restored)")}`);
     } catch {
       console.log(`  ${skip} Hermes config ${dim("(could not update config.yaml)")}`);
     }
     try {
-      execSync(`"${hermesPython}" -m pip uninstall -y hermes-plugin-pushary`, { stdio: "pipe", timeout: 6e4 });
+      guardedExec(`"${hermesPython}" -m pip uninstall -y hermes-plugin-pushary`, { stdio: "pipe", timeout: 6e4 }, "pip uninstall hermes-plugin-pushary");
       console.log(`  ${check} Hermes plugin ${dim("(pip uninstalled)")}`);
     } catch {
       console.log(`  ${skip} Hermes plugin ${dim("(not installed)")}`);
@@ -247,8 +277,8 @@ var main = async () => {
         const cleaned = lines.filter((l) => !isOurExport(l)).join("\n");
         if (cleaned !== content) {
           const backup = `${shellFile}.pushary-backup-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
-          copyFileSync(shellFile, backup);
-          writeFileSync(shellFile, cleaned, "utf-8");
+          if (!dryRun) copyFileSync(shellFile, backup);
+          guardedWrite(shellFile, cleaned);
           console.log(`  ${check} ${shellFile.split("/").pop()} ${dim(`(removed the export, backup at ${backup})`)}`);
         }
         for (const line of declined) {
@@ -265,7 +295,7 @@ var main = async () => {
     console.log(`  ${skip} claude alias ${dim("(not set)")}`);
   }
   if (existsSync(PUSHARY_DIR)) {
-    rmSync(PUSHARY_DIR, { recursive: true });
+    guardedRemove(PUSHARY_DIR);
     console.log(`  ${check} Local state ${dim("(~/.pushary removed: stored API key, ledger)")}`);
   } else {
     console.log(`  ${skip} Local state ${dim("(~/.pushary not found)")}`);
@@ -275,7 +305,7 @@ var main = async () => {
     for (const f of readdirSync(tmpdir())) {
       if (!f.startsWith("pushary-")) continue;
       try {
-        rmSync(join(tmpdir(), f), { recursive: true, force: true });
+        guardedRemove(join(tmpdir(), f), { force: true });
         swept++;
       } catch {
       }
@@ -285,7 +315,7 @@ var main = async () => {
   }
   try {
     execNpm("uninstall -g --no-workspaces @pushary/agent-hooks", { stdio: "ignore", timeout: 3e4 });
-    console.log(`  ${check} Global package ${dim("(uninstalled)")}`);
+    console.log(`  ${check} Global package ${dim(did("uninstalled"))}`);
   } catch {
     console.log(`  ${skip} Global package ${dim("(not installed)")}`);
   }

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

@@ -31,10 +31,7 @@ import {
   toCodexWire,
   toPolicyLookup,
   waitForAnswer
-} from "../chunk-VFBYRR2N.js";
-import {
-  getMachineId
-} from "../chunk-RN3NOEJF.js";
+} from "../chunk-HIIBSYFJ.js";
 import {
   isGatingMoment,
   recordKeylessMoment
@@ -46,6 +43,9 @@ import {
   hookWaitClamped,
   hookWaitDeadline
 } from "../chunk-DQAN3JQP.js";
+import {
+  getMachineId
+} from "../chunk-RN3NOEJF.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";

package/dist/bin/pushary-codex.js

@@ -3,12 +3,12 @@ import {
   askUser,
   reportEvent,
   waitForAnswer
-} from "../chunk-VFBYRR2N.js";
+} from "../chunk-HIIBSYFJ.js";
+import "../chunk-HNTKTK5B.js";
+import "../chunk-DQAN3JQP.js";
 import {
   getMachineId
 } from "../chunk-RN3NOEJF.js";
-import "../chunk-HNTKTK5B.js";
-import "../chunk-DQAN3JQP.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";

package/dist/bin/pushary-connect.js

@@ -1,22 +1,22 @@
 #!/usr/bin/env node
 import {
   printKeyCheck
-} from "../chunk-R6C4USIV.js";
+} from "../chunk-ONVEYEVR.js";
 import {
   confirmAppConnection,
   connectDevice,
   printConnectInstructions
-} from "../chunk-GX64YGU3.js";
+} from "../chunk-3O27ZSRE.js";
 import "../chunk-3EGEA4KH.js";
 import {
   parseFlags
 } from "../chunk-N4DA4CJB.js";
 import {
   readKeySource
-} from "../chunk-B26DNXCA.js";
+} from "../chunk-247C4RE5.js";
 import {
   checkApiKey
-} from "../chunk-UKNAAVEE.js";
+} from "../chunk-YJ7YZRVV.js";
 import {
   createIo
 } from "../chunk-TX7KBKT7.js";
@@ -26,10 +26,10 @@ import {
 import "../chunk-BC3VCZ3E.js";
 import {
   exitOnHelpFlag
-} from "../chunk-HUJQSP4F.js";
+} from "../chunk-IIZZYUWK.js";
 import {
   EXIT
-} from "../chunk-SML23YOT.js";
+} from "../chunk-SP7OZXCQ.js";
 import "../chunk-HNTKTK5B.js";
 import "../chunk-DQAN3JQP.js";
 import "../chunk-2UMNXADU.js";

package/dist/bin/pushary-daemon.js

@@ -7,8 +7,10 @@ import {
 } from "../chunk-MUEW424A.js";
 import {
   exitOnHelpFlag
-} from "../chunk-HUJQSP4F.js";
-import "../chunk-SML23YOT.js";
+} from "../chunk-IIZZYUWK.js";
+import {
+  EXIT
+} from "../chunk-SP7OZXCQ.js";
 import {
   getMachineId
 } from "../chunk-RN3NOEJF.js";
@@ -30,6 +32,19 @@ var MAX_ERROR_STREAK = 6;
 var REQUEST_TIMEOUT_MS = 1e4;
 var MAX_SPAWNS_PER_WINDOW = 5;
 var SPAWN_WINDOW_MS = 6e4;
+var DrainError = class extends Error {
+  constructor(status) {
+    super(`drain ${status}`);
+    this.status = status;
+    this.name = "DrainError";
+  }
+};
+var isAuthFailure = (err) => {
+  if (typeof err !== "object" || err === null) return false;
+  const candidate = err;
+  if (candidate.name !== "DrainError") return false;
+  return candidate.status === 401 || candidate.status === 403;
+};
 var NATIVE_AGENT_BINARIES = { codex: "codex", gemini: "gemini" };
 var buildSpawnLaunch = (req, opts) => {
   const agent = req.agent === "codex" || req.agent === "gemini" ? req.agent : "claude";
@@ -68,6 +83,9 @@ var runSpawnDaemon = async () => {
   const spawnTimestamps = [];
   let timer;
   let inflight;
+  let fatalCode = null;
+  let finish = () => {
+  };
   const launch = (req) => {
     spawnTimestamps.push(Date.now());
     const cwd = req.cwd && existsSync(req.cwd) ? req.cwd : process.cwd();
@@ -98,7 +116,7 @@ var runSpawnDaemon = async () => {
       body: JSON.stringify({ machineId }),
       signal
     });
-    if (!res.ok) throw new Error(`drain ${res.status}`);
+    if (!res.ok) throw new DrainError(res.status);
     const data = await res.json();
     const spawn2 = data.spawn;
     return spawn2 && typeof spawn2.prompt === "string" && typeof spawn2.id === "string" ? spawn2 : null;
@@ -126,7 +144,16 @@ var runSpawnDaemon = async () => {
       } else {
         idleTicks++;
       }
-    } catch {
+    } catch (err) {
+      if (isAuthFailure(err)) {
+        const status = err.status;
+        fatalCode = EXIT.UNAUTHENTICATED;
+        stderr(
+          status === 401 ? "[pushary] daemon stopping: this machine's key was rejected. Run `pushary login` to sign in again.\n" : "[pushary] daemon stopping: this workspace has no active plan, so the queue is closed. Pick one at pushary.com/dashboard/settings?tab=billing\n"
+        );
+        finish();
+        return;
+      }
       errorStreak = Math.min(errorStreak + 1, MAX_ERROR_STREAK);
     } finally {
       clearTimeout(timeout);
@@ -152,8 +179,13 @@ var runSpawnDaemon = async () => {
       resolve();
     };
     for (const signal of signals) process.on(signal, onSignal);
+    finish = () => {
+      teardown();
+      for (const signal of signals) process.off(signal, onSignal);
+      resolve();
+    };
   });
-  return 0;
+  return fatalCode ?? 0;
 };
 
 // bin/pushary-daemon.ts