@pushary/agent-hooks 0.89.12 → 0.90.0

package/dist/bin/pushary-clean.js

@@ -1,18 +1,19 @@
 #!/usr/bin/env node
 import {
   HERMES_CONFIG_SCRIPT,
+  createGuards,
   resolveHermesPython,
   runHermesPythonScript
-} from "../chunk-QFJZHVVL.js";
+} from "../chunk-AZPIQG4G.js";
 import {
   removeInstructionBlock,
   shortenHome,
   unregisterPluginLocation,
   vscodeSettingsTargets
-} from "../chunk-3XSP5SML.js";
+} from "../chunk-FQL5E6NG.js";
 import {
   pusharyHookExecutable
-} from "../chunk-NESKLV6R.js";
+} from "../chunk-DZDI62LY.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
@@ -22,25 +23,25 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-7DK3ZH3N.js";
+} from "../chunk-CELX75MW.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removeGeminiSettings,
   removePusharySettings,
   restoreClaudeMcpServer
-} from "../chunk-6V7ZDH3A.js";
-import "../chunk-KVHP5ZME.js";
-import "../chunk-VF3RTVWY.js";
+} from "../chunk-GL3FFM7A.js";
+import "../chunk-2LAHXHBR.js";
+import "../chunk-EZIEXHYM.js";
 import {
   disableDaemonService
-} from "../chunk-PS7DQ2SU.js";
+} from "../chunk-F2ICEWZL.js";
 import "../chunk-XHKBHWLX.js";
 import {
   execNpm
 } from "../chunk-L4ZCFMWW.js";
-import "../chunk-JVZX5YRJ.js";
-import "../chunk-5NDB3YOE.js";
+import "../chunk-L4E2BIJ2.js";
+import "../chunk-54ELC7D7.js";
 import {
   claudeJson,
   claudeMcpReceipt,
@@ -63,14 +64,14 @@ import {
   removeCodexHookTrust,
   removeCodexHooks,
   vscodePluginDir
-} from "../chunk-OVEGEQSB.js";
+} from "../chunk-KUZWXPUS.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-OTPJ4FUR.js";
-import "../chunk-RLQWNEPM.js";
+} from "../chunk-BVBEURWJ.js";
+import "../chunk-43GMYSS4.js";
 import "../chunk-DINDL2CF.js";
 import {
   removeClaudeAlias
@@ -84,7 +85,7 @@ import "../chunk-2UMNXADU.js";
 import {
   CURSOR_GATE_EVENTS,
   HOOK_LOCATOR_BINARY
-} from "../chunk-3MCEES6Z.js";
+} from "../chunk-VNMKIJZB.js";
 
 // bin/pushary-clean.ts
 import { existsSync, readFileSync, copyFileSync, readdirSync } from "fs";
@@ -93,24 +94,6 @@ import { homedir, tmpdir } from "os";
 import { confirm } from "@inquirer/prompts";
 import { parse as parseTOML, stringify as stringifyTOML } from "smol-toml";
 
-// src/cli/dry-run.ts
-import { execSync } from "child_process";
-import { rmSync, writeFileSync } from "fs";
-var createGuards = (isDryRun, note) => ({
-  write: (path, contents) => {
-    if (isDryRun()) return note("rewrite", path);
-    writeFileSync(path, contents, "utf-8");
-  },
-  remove: (path, options = {}) => {
-    if (isDryRun()) return note("remove ", path);
-    rmSync(path, { recursive: true, force: options.force ?? false });
-  },
-  exec: (command, options, describe) => {
-    if (isDryRun()) return note("run    ", describe);
-    execSync(command, options);
-  }
-});
-
 // src/app-owned-paths.ts
 var APP_OWNED_ENTRIES = [
   // PusharyPaths.bin: bridgeStub, bridgeCache

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

@@ -6,16 +6,19 @@ import {
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-6VXNA5JB.js";
-import "../chunk-WDVQ6O4C.js";
+} from "../chunk-CNPAT3HL.js";
+import "../chunk-7FE2KABY.js";
 import "../chunk-QZCFVWA7.js";
 import {
   transcriptsEnabled
-} from "../chunk-JJV5Q4KG.js";
+} from "../chunk-UZNKVRLE.js";
 import {
+  SESSION_IDLE_TIMEOUT_MS,
+  describeIdleWindow,
+  idleDeadlinePassed,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-6GU55AQQ.js";
+} from "../chunk-Y6BWPERV.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
@@ -24,17 +27,17 @@ import {
 } from "../chunk-L4ZCFMWW.js";
 import {
   getMachineId
-} from "../chunk-5NDB3YOE.js";
-import "../chunk-OVEGEQSB.js";
-import "../chunk-RNKPLUWC.js";
+} from "../chunk-54ELC7D7.js";
+import "../chunk-KUZWXPUS.js";
+import "../chunk-OSALSIUF.js";
 import "../chunk-BC3VCZ3E.js";
-import "../chunk-XREW7RQ3.js";
+import "../chunk-JW4KO5AF.js";
 import "../chunk-4LL6LG5X.js";
 import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-3MCEES6Z.js";
+import "../chunk-VNMKIJZB.js";
 
 // bin/pushary-codex-bridge.ts
 import { existsSync } from "fs";
@@ -187,15 +190,21 @@ var rpcTurnId = (result) => {
 };
 var runCodexBridge = async (options) => {
   const timeoutMs = options.requestTimeoutMs ?? 1e4;
+  const now = options.now ?? Date.now;
+  const idleTimeoutMs = options.idleTimeoutMs ?? SESSION_IDLE_TIMEOUT_MS;
   const rpc = new JsonRpcClient(options.appServer, options.cwd, timeoutMs);
   let threadId = options.resumeThreadId ?? null;
   let activeTurnId = null;
+  let lastCompletedTurnId = null;
+  let idleSince = now();
+  let idledOut = false;
   let relay = null;
   let linked = false;
   let stopHeartbeat = () => {
   };
   let ownership = null;
   const messages = /* @__PURE__ */ new Map();
+  const idleDeadlineReached = () => activeTurnId === null && idleDeadlinePassed(idleSince, now(), idleTimeoutMs);
   const reportBody = (event, action) => ({
     event,
     action,
@@ -213,7 +222,9 @@ var runCodexBridge = async (options) => {
     const params = message.params ?? {};
     if (message.method === "turn/started") activeTurnId = string(object(params.turn)?.id);
     if (message.method === "turn/completed") {
+      lastCompletedTurnId = string(object(params.turn)?.id) ?? activeTurnId;
       activeTurnId = null;
+      idleSince = now();
       void report("stop", "Turn completed").catch(() => {
       });
     }
@@ -253,7 +264,12 @@ var runCodexBridge = async (options) => {
       reportBody("session_start", options.resumeThreadId ? "Session resumed" : "Session started")
     );
     linked = true;
-    stopHeartbeat = startLiveSessionHeartbeat(options, reportBody("heartbeat", "Session online"));
+    stopHeartbeat = startLiveSessionHeartbeat(
+      options,
+      reportBody("heartbeat", "Session online"),
+      void 0,
+      () => ownership?.touch()
+    );
     const startTurn = async (text, commandId) => {
       relay?.add({ type: "user", uuid: commandId, message: { role: "user", content: text } });
       const result = activeTurnId ? await rpc.request("turn/steer", {
@@ -268,11 +284,16 @@ var runCodexBridge = async (options) => {
         model: options.model ?? null,
         clientUserMessageId: commandId
       });
-      activeTurnId = rpcTurnId(result) ?? activeTurnId;
+      const startedTurnId = rpcTurnId(result);
+      if (startedTurnId && startedTurnId !== lastCompletedTurnId) activeTurnId = startedTurnId;
     };
     if (options.prompt) await startTurn(options.prompt, `spawn-${options.spawnId}`);
     let pendingAck = null;
     while (!options.signal.aborted && !rpc.isClosed) {
+      if (idleDeadlineReached()) {
+        idledOut = true;
+        break;
+      }
       try {
         if (pendingAck) {
           const acknowledged = await postLiveSession(options, "/api/agent/command/ack", pendingAck);
@@ -292,6 +313,7 @@ var runCodexBridge = async (options) => {
           const commandId = string(command?.id);
           const text = string(command?.text);
           if (commandId && text) {
+            idleSince = now();
             try {
               await startTurn(text, commandId);
               pendingAck = {
@@ -321,7 +343,10 @@ var runCodexBridge = async (options) => {
       await rpc.request("turn/interrupt", { threadId, turnId: activeTurnId }).catch(() => null);
     }
     await relay?.flush();
-    await report("session_closed", "Session stopped").catch(() => null);
+    await report(
+      "session_closed",
+      idledOut ? `Session ended after ${describeIdleWindow(idleTimeoutMs)} idle` : "Session stopped"
+    ).catch(() => null);
     return "stopped";
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);

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

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   defersToNativeMode
-} from "../chunk-GKPURU7P.js";
+} from "../chunk-I463AEG3.js";
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "../chunk-FCUUVHTS.js";
+} from "../chunk-VHWCVD42.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
@@ -34,7 +34,7 @@ import {
   toCodexWire,
   toPolicyLookup,
   toPolicyLookups
-} from "../chunk-OADGBOP7.js";
+} from "../chunk-TDZFPMSZ.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -42,7 +42,7 @@ import {
   pollForAnswer,
   savePendingQuestion,
   sendNotification
-} from "../chunk-JHJHCMAF.js";
+} from "../chunk-FXEVRLHC.js";
 import {
   UNNAMED_ACTION,
   deriveActionBody,
@@ -50,18 +50,18 @@ import {
   deriveToolTarget,
   describeToolCall,
   scopePathFor
-} from "../chunk-JVZX5YRJ.js";
+} from "../chunk-L4E2BIJ2.js";
 import {
   getMachineId
-} from "../chunk-5NDB3YOE.js";
+} from "../chunk-54ELC7D7.js";
 import {
   canonicalJson
-} from "../chunk-OVEGEQSB.js";
+} from "../chunk-KUZWXPUS.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-XREW7RQ3.js";
+import "../chunk-JW4KO5AF.js";
 import "../chunk-4LL6LG5X.js";
 import {
   getApiKey
@@ -73,7 +73,7 @@ import {
   hookWaitClamped,
   hookWaitDeadline,
   resolveGate
-} from "../chunk-3MCEES6Z.js";
+} from "../chunk-VNMKIJZB.js";
 
 // bin/pushary-codex-hook.ts
 import { basename } from "path";
@@ -250,7 +250,10 @@ var fromRecordedDecision = (decision) => {
   if (decision.kind === "denied") return codexDeny(decision.reason);
   return codexPass();
 };
+var PUSHARY_OWN_TOOL_PREFIX = "mcp__pushary__";
+var isPusharyOwnTool = (toolName) => typeof toolName === "string" && toolName.startsWith(PUSHARY_OWN_TOOL_PREFIX);
 var decidePermissionRequest = async (input) => {
+  if (isPusharyOwnTool(input.tool_name)) return codexPass();
   const recorded = consumeCodexCallDecision(callKeyFor(input));
   if (recorded) return fromRecordedDecision(recorded);
   try {
@@ -278,7 +281,7 @@ var decidePermissionRequest = async (input) => {
       if (answer.value === "yes") return codexAllow();
       return codexDeny(denyReasonFrom(answer.value, answer.note));
     }
-    savePendingQuestion(input.session_id || DEFAULT_SESSION, correlationId);
+    savePendingQuestion(input.session_id || DEFAULT_SESSION, correlationId, input.tool_use_id);
     if (toolPolicy.mode === "push_first") return codexPass();
     if (clampCut) return codexPass();
     return permissionTimeoutDecision(toolPolicy.timeoutAction);
@@ -293,7 +296,33 @@ var recordPreToolUse = (key, outcome) => {
   );
   return outcome;
 };
+var permissionRequestNeverFires = (permissionMode) => permissionMode === "bypassPermissions";
+var decidePushFirstBeforeTheTool = async (apiKey, input, lookup, pushFirstSeconds, callKey) => {
+  let pushed;
+  try {
+    pushed = await pushQuestion(apiKey, input, lookup, pushFirstSeconds, "push_first");
+  } catch {
+    return recordPreToolUse(callKey, codexPass());
+  }
+  const { answer, correlationId, suppressed, noDevices } = pushed;
+  if (suppressed || noDevices) {
+    await cancelQuestion(apiKey, correlationId).catch(() => {
+    });
+    return recordPreToolUse(callKey, codexPass());
+  }
+  if (answer.answered) {
+    if (isDeferAnswer(answer.value)) return recordPreToolUse(callKey, codexPass());
+    if (answer.value === "yes") {
+      recordCodexCallDecision(callKey, { kind: "approved" });
+      return codexPass();
+    }
+    return recordPreToolUse(callKey, codexDeny(denyReasonFrom(answer.value, answer.note)));
+  }
+  savePendingQuestion(input.session_id || DEFAULT_SESSION, correlationId, input.tool_use_id);
+  return recordPreToolUse(callKey, codexPass());
+};
 var decidePreToolUse = async (input) => {
+  if (isPusharyOwnTool(input.tool_name)) return codexPass();
   let apiKey;
   try {
     apiKey = getApiKey();
@@ -342,7 +371,7 @@ var decidePreToolUse = async (input) => {
         }
         return recordPreToolUse(callKey, codexDeny(denyReasonFrom(answer.value, answer.note)));
       }
-      savePendingQuestion(input.session_id || DEFAULT_SESSION, correlationId);
+      savePendingQuestion(input.session_id || DEFAULT_SESSION, correlationId, input.tool_use_id);
       if (clampCut) return recordPreToolUse(callKey, codexPass());
       return recordPreToolUse(callKey, preToolUseTimeoutDecision(toolPolicy.timeoutAction));
     }
@@ -351,6 +380,9 @@ var decidePreToolUse = async (input) => {
       recordCodexCallDecision(callKey, { kind: "handled" });
       return codexPass();
     }
+    if (toolPolicy.mode === "push_first" && permissionRequestNeverFires(input.permission_mode)) {
+      return decidePushFirstBeforeTheTool(apiKey, input, lookup, toolPolicy.pushFirstSeconds, callKey);
+    }
     return codexPass();
   } catch {
     return codexPass();
@@ -398,7 +430,8 @@ var main = async () => {
           tool_input: lookup.input,
           tool_result: asToolResult(input.tool_response),
           cwd: input.cwd,
-          session_id: input.session_id
+          session_id: input.session_id,
+          tool_use_id: input.tool_use_id
         }, CODEX_AGENT));
         break;
       }

package/dist/bin/pushary-codex.js

@@ -1,26 +1,26 @@
 #!/usr/bin/env node
 import {
   reportEvent
-} from "../chunk-OADGBOP7.js";
+} from "../chunk-TDZFPMSZ.js";
 import {
   askUser,
   waitForAnswer
-} from "../chunk-JHJHCMAF.js";
-import "../chunk-JVZX5YRJ.js";
+} from "../chunk-FXEVRLHC.js";
+import "../chunk-L4E2BIJ2.js";
 import {
   getMachineId
-} from "../chunk-5NDB3YOE.js";
-import "../chunk-OVEGEQSB.js";
+} from "../chunk-54ELC7D7.js";
+import "../chunk-KUZWXPUS.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-XREW7RQ3.js";
+import "../chunk-JW4KO5AF.js";
 import "../chunk-4LL6LG5X.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";
-import "../chunk-3MCEES6Z.js";
+import "../chunk-VNMKIJZB.js";
 
 // bin/pushary-codex.ts
 import { basename } from "path";

package/dist/bin/pushary-connect.js

@@ -1,16 +1,17 @@
 #!/usr/bin/env node
 import {
   printKeyCheck
-} from "../chunk-327YMKP5.js";
+} from "../chunk-DYP6SMOR.js";
 import {
-  confirmAppConnection,
   connectDevice,
+  connectExistingApp,
   printConnectInstructions
-} from "../chunk-MFNQ5IMW.js";
+} from "../chunk-PYA4FLKI.js";
 import "../chunk-3EGEA4KH.js";
 import {
   checkApiKey
-} from "../chunk-Y4WVZIEI.js";
+} from "../chunk-AJYV3VGU.js";
+import "../chunk-QCGNGEGE.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
@@ -19,12 +20,12 @@ import {
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-OTPJ4FUR.js";
-import "../chunk-RLQWNEPM.js";
+} from "../chunk-BVBEURWJ.js";
+import "../chunk-43GMYSS4.js";
 import "../chunk-DINDL2CF.js";
 import {
   readKeySource
-} from "../chunk-RNKPLUWC.js";
+} from "../chunk-OSALSIUF.js";
 import "../chunk-BC3VCZ3E.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
@@ -34,10 +35,10 @@ import {
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-XREW7RQ3.js";
+import "../chunk-JW4KO5AF.js";
 import "../chunk-4LL6LG5X.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-3MCEES6Z.js";
+import "../chunk-VNMKIJZB.js";
 
 // bin/pushary-connect.ts
 exitOnHelpFlag("connect");
@@ -79,7 +80,7 @@ var main = async () => {
     if (keyCheck.kind !== "unreachable") process.exit(report.exitCode);
     console.log();
   }
-  const result = options.mode === "app" ? await confirmAppConnection(source.key) : process.stdout.isTTY ? await connectDevice(source.key, { showCapabilities: true }) : await printConnectInstructions(source.key);
+  const result = options.mode === "app" ? await connectExistingApp(source.key) : process.stdout.isTTY ? await connectDevice(source.key, { showCapabilities: true }) : await printConnectInstructions(source.key);
   console.log();
   if (result.reachesYou) {
     console.log(`  ${dim("Your phone can receive approvals. Try")} ${cyan("pushary doctor --roundtrip")} ${dim("to answer one.")}`);