@pushary/agent-hooks 0.85.2 → 0.87.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.86.0
+
+### Approving a plan from your phone
+
+Exiting plan mode blocked the terminal and pushed nothing, so an away user's agent
+sat waiting on the one approval that decides everything after it. `ExitPlanMode` was
+never in the hook's tool matcher, and `plan` is a mode Pushary steps aside for
+entirely, so matching it alone would not have helped either.
+
+The plan approval now reaches your phone before Pushary steps aside, and it carries
+the plan itself, redacted and capped like any diff, so you are approving something
+you can read rather than a bare tool name. Two options rather than the terminal's
+three: a hook cannot set the permission mode the session lands in, so offering that
+choice would have quietly dropped half of what you picked.
+
+Falls back to the terminal exactly as before whenever the phone cannot answer.
+
 ## 0.85.2
 
 ### One agent-protocol renderer for CLI and native approvals

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

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   handleBell
-} from "../chunk-GM74DUMS.js";
+} from "../chunk-2T3GX7WG.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
-import "../chunk-KZIGJLOX.js";
+import "../chunk-OT4YD54Q.js";
 import "../chunk-BC3VCZ3E.js";
 import "../chunk-6MTNS63X.js";
-import "../chunk-CWV4CMB6.js";
+import "../chunk-Y3UTTFTZ.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-K337LIBD.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-bell-hook.ts
 var main = async () => {

package/dist/bin/pushary-bell.js

@@ -5,18 +5,18 @@ import {
   liveAgentCount,
   ring,
   upgradeThreshold
-} from "../chunk-GM74DUMS.js";
+} from "../chunk-2T3GX7WG.js";
 import {
   guardBinary
-} from "../chunk-HSGEEBBL.js";
+} from "../chunk-M7RYIZX6.js";
 import "../chunk-VT4IVERX.js";
 import {
   claudeSettings
-} from "../chunk-KJW6NKF7.js";
+} from "../chunk-B3V2H6SA.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
-import "../chunk-KZIGJLOX.js";
+import "../chunk-OT4YD54Q.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
@@ -30,13 +30,13 @@ import {
   readJsonSafe,
   writeJsonAtomic
 } from "../chunk-6MTNS63X.js";
-import "../chunk-CWV4CMB6.js";
+import "../chunk-Y3UTTFTZ.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-K337LIBD.js";
+import "../chunk-7YJS2VTG.js";
 
 // src/bell/install.ts
 import { join } from "path";

package/dist/bin/pushary-claude.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   ensureDaemonRunning
-} from "../chunk-4YMWLMAP.js";
+} from "../chunk-SJVLFIYP.js";
 import {
   buildTranscriptRecords,
   decodePublicKey,
@@ -9,32 +9,34 @@ import {
   generateSessionKey,
   uploadTranscriptRecords,
   wrapSessionKey
-} from "../chunk-T54OT7IY.js";
+} from "../chunk-ECEUMWBH.js";
 import {
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-LXWISFF3.js";
+} from "../chunk-QBWYNVKY.js";
 import {
   needsShell,
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
 import "../chunk-VT4IVERX.js";
-import "../chunk-KJW6NKF7.js";
+import "../chunk-B3V2H6SA.js";
 import {
   isDeferAnswer
 } from "../chunk-YHG74UFF.js";
 import {
-  askUser,
-  cancelQuestion,
   deriveToolTarget,
   describeToolCall,
   fetchModeState,
   getPolicy,
   repoKeyFor,
   reportEvent,
-  scopePathFor,
+  scopePathFor
+} from "../chunk-V2XPF77V.js";
+import {
+  askUser,
+  cancelQuestion,
   waitForAnswer
-} from "../chunk-DPDUB4XF.js";
+} from "../chunk-J3YDT4HM.js";
 import {
   getMachineId
 } from "../chunk-RN3NOEJF.js";
@@ -42,7 +44,7 @@ import "../chunk-DINDL2CF.js";
 import "../chunk-6MTNS63X.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-CWV4CMB6.js";
+import "../chunk-Y3UTTFTZ.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import {
@@ -52,7 +54,7 @@ import {
 import {
   KILL_REASON,
   resolveGate
-} from "../chunk-K337LIBD.js";
+} from "../chunk-7YJS2VTG.js";
 
 // src/wrapper/claudeBinary.ts
 import { statSync } from "fs";

package/dist/bin/pushary-clean.js

@@ -1,18 +1,19 @@
 #!/usr/bin/env node
+import {
+  removeClaudeMcpServers,
+  removePusharySettings
+} from "../chunk-5646VKR4.js";
 import {
   removeInstructionBlock,
   shortenHome,
   unregisterPluginLocation,
   vscodeSettingsTargets
-} from "../chunk-4U2YRHNF.js";
+} from "../chunk-IWL5LWIE.js";
 import {
   removeGeminiSettings
-} from "../chunk-GY3I353G.js";
-import {
-  removeClaudeMcpServers,
-  removePusharySettings
-} from "../chunk-XJDL3MUE.js";
-import "../chunk-HSGEEBBL.js";
+} from "../chunk-ZZE6FN7T.js";
+import "../chunk-ATBKJNWS.js";
+import "../chunk-M7RYIZX6.js";
 import {
   execNpm
 } from "../chunk-VT4IVERX.js";
@@ -33,7 +34,7 @@ import {
   pusharyDir,
   removeCodexHooks,
   vscodePluginDir
-} from "../chunk-KJW6NKF7.js";
+} from "../chunk-B3V2H6SA.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
@@ -49,7 +50,7 @@ import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-K337LIBD.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-clean.ts
 import { existsSync, readFileSync, copyFileSync, readdirSync } from "fs";

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

@@ -6,19 +6,19 @@ import {
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-JBLRZGTT.js";
-import "../chunk-T54OT7IY.js";
+} from "../chunk-WLLBFDVY.js";
+import "../chunk-ECEUMWBH.js";
 import {
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-LXWISFF3.js";
+} from "../chunk-QBWYNVKY.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
 import {
   resolveBinary
 } from "../chunk-VT4IVERX.js";
-import "../chunk-KJW6NKF7.js";
+import "../chunk-B3V2H6SA.js";
 import {
   getMachineId
 } from "../chunk-RN3NOEJF.js";
@@ -27,7 +27,7 @@ import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-K337LIBD.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-codex-bridge.ts
 import { existsSync } from "fs";

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

@@ -2,7 +2,7 @@
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "../chunk-PKUNB3SN.js";
+} from "../chunk-7MBDFNUC.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
@@ -12,9 +12,6 @@ import {
 } from "../chunk-YHG74UFF.js";
 import {
   CODEX_AGENT,
-  DEFAULT_SESSION,
-  askUser,
-  cancelQuestion,
   codexAllow,
   codexDeny,
   codexPass,
@@ -34,20 +31,25 @@ import {
   readLastPrompt,
   repoKeyFor,
   reportEvent,
-  savePendingQuestion,
   scopePathFor,
-  sendNotification,
   toCodexWire,
   toPolicyLookup,
-  toPolicyLookups,
-  waitForAnswer
-} from "../chunk-DPDUB4XF.js";
+  toPolicyLookups
+} from "../chunk-V2XPF77V.js";
+import {
+  DEFAULT_SESSION,
+  askUser,
+  cancelQuestion,
+  pollForAnswer,
+  savePendingQuestion,
+  sendNotification
+} from "../chunk-J3YDT4HM.js";
 import {
   getMachineId
 } from "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-CWV4CMB6.js";
+import "../chunk-Y3UTTFTZ.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import {
@@ -60,7 +62,7 @@ import {
   hookWaitClamped,
   hookWaitDeadline,
   resolveGate
-} from "../chunk-K337LIBD.js";
+} from "../chunk-7YJS2VTG.js";
 
 // bin/pushary-codex-hook.ts
 import { basename, join } from "path";
@@ -111,24 +113,6 @@ var claimNotify = (toolUseId) => {
     return true;
   }
 };
-var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-var pollForAnswer = async (apiKey, correlationId, deadlineMs, pollInterval = 2e3) => {
-  while (Date.now() < deadlineMs) {
-    const remaining = Math.min(Math.max(deadlineMs - Date.now(), 1e3), 3e4);
-    let answer;
-    try {
-      answer = await waitForAnswer(apiKey, correlationId, remaining);
-    } catch {
-      if (Date.now() + pollInterval >= deadlineMs) break;
-      await sleep(pollInterval);
-      continue;
-    }
-    if (answer.answered) return answer;
-    if (Date.now() + pollInterval >= deadlineMs) break;
-    await sleep(pollInterval);
-  }
-  return { answered: false };
-};
 var agentNameFor = (input) => `Codex - ${basename(input.cwd ?? process.cwd())}`;
 var describeFor = (input, lookup) => input.tool_name === "apply_patch" ? describeApplyPatch(input.tool_input?.command) ?? describeToolCall(lookup.tool, lookup.input, "hook") : describeToolCall(lookup.tool, lookup.input, "hook");
 var pushQuestion = async (apiKey, input, lookup, waitSeconds, mode) => {

package/dist/bin/pushary-codex.js

@@ -1,21 +1,23 @@
 #!/usr/bin/env node
+import {
+  reportEvent
+} from "../chunk-V2XPF77V.js";
 import {
   askUser,
-  reportEvent,
   waitForAnswer
-} from "../chunk-DPDUB4XF.js";
+} from "../chunk-J3YDT4HM.js";
 import {
   getMachineId
 } from "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-CWV4CMB6.js";
+import "../chunk-Y3UTTFTZ.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";
-import "../chunk-K337LIBD.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-codex.ts
 import { basename } from "path";

package/dist/bin/pushary-connect.js

@@ -1,22 +1,22 @@
 #!/usr/bin/env node
 import {
   printKeyCheck
-} from "../chunk-NTIUQB3E.js";
+} from "../chunk-JAICP7BA.js";
 import {
   confirmAppConnection,
   connectDevice,
   printConnectInstructions
-} from "../chunk-LCA2EQTK.js";
+} from "../chunk-A3PFIWWN.js";
 import "../chunk-3EGEA4KH.js";
 import {
   checkApiKey
-} from "../chunk-LSB6PFLN.js";
+} from "../chunk-A4I5JGCW.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
 import {
   readKeySource
-} from "../chunk-KZIGJLOX.js";
+} from "../chunk-OT4YD54Q.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
@@ -29,7 +29,7 @@ import "../chunk-DINDL2CF.js";
 import "../chunk-6MTNS63X.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-CWV4CMB6.js";
+import "../chunk-Y3UTTFTZ.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
@@ -37,7 +37,7 @@ import {
   EXIT
 } from "../chunk-KZERVKTD.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-K337LIBD.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-connect.ts
 exitOnHelpFlag("connect");

package/dist/bin/pushary-daemon.js

@@ -8,7 +8,7 @@ import {
   acquireDaemonLease,
   readDaemonStatus,
   requestDaemonHandoff
-} from "../chunk-4YMWLMAP.js";
+} from "../chunk-SJVLFIYP.js";
 import {
   CODEX_BRIDGE_CAPABILITY,
   CODEX_RESUME_CAPABILITY,
@@ -17,7 +17,7 @@ import {
 import {
   findLiveProcessBySpawnId,
   ownsLiveProcess
-} from "../chunk-LXWISFF3.js";
+} from "../chunk-QBWYNVKY.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
@@ -26,7 +26,7 @@ import {
   resolveGlobalPackageVersion,
   resolvePackageVersionFromBinary
 } from "../chunk-VT4IVERX.js";
-import "../chunk-KJW6NKF7.js";
+import "../chunk-B3V2H6SA.js";
 import {
   getMachineId
 } from "../chunk-RN3NOEJF.js";
@@ -43,7 +43,7 @@ import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-K337LIBD.js";
+import "../chunk-7YJS2VTG.js";
 
 // src/spawn-daemon.ts
 import { execFileSync, spawn } from "child_process";

package/dist/bin/pushary-disconnect.js

@@ -1,32 +1,34 @@
 #!/usr/bin/env node
-import {
-  removeGeminiSettings
-} from "../chunk-GY3I353G.js";
 import {
   removeClaudeMcpServers,
   removePusharySettings
-} from "../chunk-XJDL3MUE.js";
-import "../chunk-HSGEEBBL.js";
+} from "../chunk-5646VKR4.js";
+import {
+  removeGeminiSettings
+} from "../chunk-ZZE6FN7T.js";
+import "../chunk-ATBKJNWS.js";
+import "../chunk-M7RYIZX6.js";
 import "../chunk-VT4IVERX.js";
 import {
   claudeJson,
   claudeSettings,
   claudeSettingsLocal,
   codexConfigToml,
+  codexHookPositions,
   codexHooksJson,
   cursorUserHooks,
   cursorUserMcp,
   geminiSettings,
   removeCodexHooks,
   removeCodexSettings
-} from "../chunk-KJW6NKF7.js";
+} from "../chunk-B3V2H6SA.js";
 import {
   exitOnHelpFlag
 } from "../chunk-SQOFGPNX.js";
 import "../chunk-GOEXZ5QJ.js";
 import "../chunk-DINDL2CF.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-K337LIBD.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-disconnect.ts
 import { readFileSync, writeFileSync } from "fs";
@@ -58,11 +60,24 @@ var disconnectPlan = (agent) => {
         { path: claudeSettingsLocal(), format: "json", remove: removePusharySettings },
         { path: claudeJson(), format: "json", remove: removeClaudeMcpServers }
       ];
-    case "codex":
+    case "codex": {
+      const positions = {};
       return [
-        { path: codexHooksJson(), format: "json", remove: removeCodexHooks },
-        { path: codexConfigToml(), format: "toml", remove: (config) => removeCodexSettings(config, codexHooksJson()) }
+        {
+          path: codexHooksJson(),
+          format: "json",
+          remove: (config) => {
+            Object.assign(positions, codexHookPositions(config));
+            return removeCodexHooks(config);
+          }
+        },
+        {
+          path: codexConfigToml(),
+          format: "toml",
+          remove: (config) => removeCodexSettings(config, codexHooksJson(), positions)
+        }
       ];
+    }
     case "gemini":
       return [{ path: geminiSettings(), format: "json", remove: removeGeminiSettings }];
     case "cursor":

package/dist/bin/pushary-doctor.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
+import {
+  describeWaitLadder
+} from "../chunk-IIENZE2J.js";
 import {
   claudeWired,
   codexWired,
   geminiWired
-} from "../chunk-JT5NQQCE.js";
-import {
-  describeWaitLadder
-} from "../chunk-IIENZE2J.js";
+} from "../chunk-XW5CHAQX.js";
 import {
   readDaemonStatus
-} from "../chunk-4YMWLMAP.js";
+} from "../chunk-SJVLFIYP.js";
 import {
   agentProbes,
   detectAgent,
@@ -18,12 +18,12 @@ import {
   isDetected,
   isPluginRegistered,
   vscodeSettingsTargets
-} from "../chunk-4U2YRHNF.js";
+} from "../chunk-IWL5LWIE.js";
 import {
   GEMINI_HOOK_BINARY,
   hasGeminiHooks,
   missingGeminiHookEvents
-} from "../chunk-GY3I353G.js";
+} from "../chunk-ZZE6FN7T.js";
 import "../chunk-XHKBHWLX.js";
 import {
   execNpm
@@ -34,6 +34,7 @@ import {
   claudeSkillDir,
   codexAgentsMd,
   codexConfigToml,
+  codexHookPositions,
   codexHooksJson,
   codexSkillDir,
   cursorPluginDir,
@@ -46,10 +47,10 @@ import {
   readCodexMcpAuth,
   untrustedCodexHookEvents,
   vscodePluginDir
-} from "../chunk-KJW6NKF7.js";
+} from "../chunk-B3V2H6SA.js";
 import {
   readLedgerSummary
-} from "../chunk-PKUNB3SN.js";
+} from "../chunk-7MBDFNUC.js";
 import {
   getMachineId
 } from "../chunk-RN3NOEJF.js";
@@ -59,19 +60,19 @@ import {
   fetchChannels,
   reachVerdict,
   verifyRoundTrip
-} from "../chunk-LCA2EQTK.js";
+} from "../chunk-A3PFIWWN.js";
 import "../chunk-3EGEA4KH.js";
 import {
   checkApiKey,
   describeKeyCheck
-} from "../chunk-LSB6PFLN.js";
+} from "../chunk-A4I5JGCW.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
 import {
   keyPrefix,
   readKeySource
-} from "../chunk-KZIGJLOX.js";
+} from "../chunk-OT4YD54Q.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
@@ -89,7 +90,7 @@ import {
   sendMcpRequest
 } from "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-CWV4CMB6.js";
+import "../chunk-Y3UTTFTZ.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
@@ -99,7 +100,7 @@ import {
 import {
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-K337LIBD.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-doctor.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
@@ -463,7 +464,12 @@ var main = async () => {
         console.log(`  ${warn} Codex: stale legacy notify entry ${dim("(double-push risk, re-run setup to remove it)")}`);
       }
       if (hookCommand) {
-        const untrusted = untrustedCodexHookEvents(codexParsed, codexHooksPath, hookCommand);
+        const untrusted = untrustedCodexHookEvents(
+          codexParsed,
+          codexHooksPath,
+          hookCommand,
+          codexHookPositions(codexHooksConfig)
+        );
         check(untrusted.length === 0, "Codex: hooks trusted", untrusted.length === 0 ? "all events trusted" : `untrusted (${untrusted.join(", ")}) \u2014 type /hooks in Codex and trust them, once`);
       }
     } else {

package/dist/bin/pushary-elicitation-hook.d.ts

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