@pushary/agent-hooks 0.89.13 → 0.90.1

package/CHANGELOG.md

@@ -1,5 +1,78 @@
 # Changelog
 
+## 0.90.1
+
+### Daemon logs distinguish health from failure
+
+Successful daemon startup and phone-requested launches now go to the normal log,
+leaving the error log for failures that need attention.
+
+### Command-store tests never touch live agent state
+
+The pending command store accepts an explicit directory override. Tests use a
+fresh temporary store, so parallel and sandboxed runs cannot read, overwrite, or
+prune commands belonging to a real agent session.
+
+## 0.90.0
+
+### A hook that needs an answer is allowed to wait for one
+
+Claude Code hooks are now registered at the 600 second budget Claude itself
+allows, so a policy that waits two minutes for a phone approval is no longer cut
+off at 120 seconds and turned into a denial the user never saw. Anything a hook
+does that is not a decision keeps its short timeout.
+
+A phone card is now withdrawn when the tool it guarded completes or the agent's
+own client denies it, so an approval cannot arrive for something that already
+finished.
+
+### The prompts that never reached the phone
+
+Codex permission requests are no longer filtered by a shell matcher, so a browser
+use request, a managed network request and an MCP tool request all reach the
+phone the same way a shell escalation does. Codex in bypass mode now decides
+before the tool runs rather than after it, which is what push-first has always
+meant everywhere else.
+
+Gemini reports its turn boundary through AfterAgent and its teardown through
+SessionEnd, so a finished Gemini turn is a finished turn rather than a session
+that stayed open.
+
+A finished subagent now ends its own session instead of ending its parent's, and
+appears under the session that started it. Context compaction is reported as
+itself rather than as a tool that ran.
+
+Pushary's own tools are never gated by Pushary, on the server exactly as in the
+hook, so asking the user a question can no longer wait on approval to ask it.
+
+### Sessions end, and a daemon that cannot log in says so
+
+A session that goes quiet is closed rather than left standing forever, and the
+daemon reaps the sessions it started. `pushary daemon status` lists what it is
+holding, how old each one is, and how much memory it is using.
+
+A daemon whose key is rejected now records that and stops, instead of restarting
+into the same rejection until something notices. `pushary doctor` says the daemon
+needs a login, and logging in clears it.
+
+### Setup and doctor tell the truth about this machine
+
+`pushary doctor` names the other tools holding the same agent hooks and how long
+each of them waits, checks that the bridge the Mac app installed can be found,
+and reports which Node the hooks will actually run under.
+
+`pushary setup` gained `--verify none` for an unattended install, prints what it
+would also do during a dry run, offers a way out of pairing, and can take over
+hooks another tool is holding with `--take-over-hooks`. `pushary mode` now sets a
+site's mode permanently unless told how long to keep it.
+
+### Machine identity and clean
+
+`pushary clean` leaves the machine identity shared with the Mac app intact, keeps
+one entry rather than two, and treats the identity file as the CLI's to own and
+the app's to read. Transcript sync seals its recovery ledger and admits a gap
+rather than syncing bookkeeping around it.
+
 ## 0.89.13
 
 ### Synced transcripts survive large turns and restarts safely

package/data/SKILL.md

@@ -348,7 +348,7 @@ else:
 
 If the user answers in chat before the push response arrives, call `cancel_question` before acting. If it returns `handoffAction: "stop"`, stop. Otherwise, if it returns false, poll once for 1 second and honor any phone answer that won the race.
 
-**A note on how long ask_user blocks:** the wait time and whether it blocks at all are governed by the site's delivery mode, which the user configures (you do not set it). In the default smart mode and push-only mode, ask_user blocks for the policy timeout; in notify-only mode it returns immediately with `answered: false` after sending the push. Always check `answered` rather than assuming the call blocked, and pass `timeoutMs` only when you need a shorter wait than the site policy.
+**A note on how long ask_user blocks:** the wait time and whether it blocks at all are governed by the site's delivery mode, which the user configures (you do not set it). The four modes are "When I'm out" (`push_first`, the default), "Every time" (`push_only`), "Updates" (`notify_only`) and "Terminal" (`terminal_only`). In When I'm out, ask_user blocks for the push-first window (45 seconds by default) and the phone is only asked when the user is away from their terminal or their Mac; in Every time it blocks for the policy timeout and the phone is always asked; in Updates it returns immediately with `answered: false` after telling the phone, because the decision belongs in the current client; in Terminal nothing reaches the phone and it also returns immediately with `answered: false`. Always check `answered` rather than assuming the call blocked, and pass `timeoutMs` only when you need a shorter wait than the site policy.
 
 ## Identifying Your Agent
 

package/data/cursor-plugin/skills/pushary/SKILL.md

@@ -341,7 +341,7 @@ else:
 
 If the user answers in chat before the push response arrives, call `cancel_question` before acting. If it returns `handoffAction: "stop"`, stop. Otherwise, if it returns false, poll once for 1 second and honor any phone answer that won the race.
 
-**A note on how long ask_user blocks:** the wait time and whether it blocks at all are governed by the site's delivery mode, which the user configures (you do not set it). In the default smart mode and push-only mode, ask_user blocks for the policy timeout; in notify-only mode it returns immediately with `answered: false` after sending the push. Always check `answered` rather than assuming the call blocked, and pass `timeoutMs` only when you need a shorter wait than the site policy.
+**A note on how long ask_user blocks:** the wait time and whether it blocks at all are governed by the site's delivery mode, which the user configures (you do not set it). The four modes are "When I'm out" (`push_first`, the default), "Every time" (`push_only`), "Updates" (`notify_only`) and "Terminal" (`terminal_only`). In When I'm out, ask_user blocks for the push-first window (45 seconds by default) and the phone is only asked when the user is away from their terminal or their Mac; in Every time it blocks for the policy timeout and the phone is always asked; in Updates it returns immediately with `answered: false` after telling the phone, because the decision belongs in the current client; in Terminal nothing reaches the phone and it also returns immediately with `answered: false`. Always check `answered` rather than assuming the call blocked, and pass `timeoutMs` only when you need a shorter wait than the site policy.
 
 ## Identifying Your Agent
 

package/data/vscode-plugin/skills/pushary/SKILL.md

@@ -341,7 +341,7 @@ else:
 
 If the user answers in chat before the push response arrives, call `cancel_question` before acting. If it returns `handoffAction: "stop"`, stop. Otherwise, if it returns false, poll once for 1 second and honor any phone answer that won the race.
 
-**A note on how long ask_user blocks:** the wait time and whether it blocks at all are governed by the site's delivery mode, which the user configures (you do not set it). In the default smart mode and push-only mode, ask_user blocks for the policy timeout; in notify-only mode it returns immediately with `answered: false` after sending the push. Always check `answered` rather than assuming the call blocked, and pass `timeoutMs` only when you need a shorter wait than the site policy.
+**A note on how long ask_user blocks:** the wait time and whether it blocks at all are governed by the site's delivery mode, which the user configures (you do not set it). The four modes are "When I'm out" (`push_first`, the default), "Every time" (`push_only`), "Updates" (`notify_only`) and "Terminal" (`terminal_only`). In When I'm out, ask_user blocks for the push-first window (45 seconds by default) and the phone is only asked when the user is away from their terminal or their Mac; in Every time it blocks for the policy timeout and the phone is always asked; in Updates it returns immediately with `answered: false` after telling the phone, because the decision belongs in the current client; in Terminal nothing reaches the phone and it also returns immediately with `answered: false`. Always check `answered` rather than assuming the call blocked, and pass `timeoutMs` only when you need a shorter wait than the site policy.
 
 ## Identifying Your Agent
 

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

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   handleBell
-} from "../chunk-C56VHSXU.js";
+} from "../chunk-5NAZ7SFS.js";
 import {
   readHookInput
 } from "../chunk-6CUUA7HO.js";
-import "../chunk-NBDU3R3G.js";
+import "../chunk-OSALSIUF.js";
 import "../chunk-BC3VCZ3E.js";
-import "../chunk-ANMHIZZY.js";
+import "../chunk-JW4KO5AF.js";
 import "../chunk-4LL6LG5X.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-QINYXLA5.js";
+import "../chunk-VNMKIJZB.js";
 
 // bin/pushary-bell-hook.ts
 var main = async () => {

package/dist/bin/pushary-bell.js

@@ -5,14 +5,14 @@ import {
   liveAgentCount,
   ring,
   upgradeThreshold
-} from "../chunk-C56VHSXU.js";
+} from "../chunk-5NAZ7SFS.js";
 import {
   guardBinary
-} from "../chunk-VF3RTVWY.js";
+} from "../chunk-EZIEXHYM.js";
 import "../chunk-L4ZCFMWW.js";
 import {
   claudeSettings
-} from "../chunk-3YGGEDJK.js";
+} from "../chunk-KUZWXPUS.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
@@ -21,22 +21,22 @@ import {
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-WHDSJ6PD.js";
-import "../chunk-GMJDQDXU.js";
+} from "../chunk-BVBEURWJ.js";
+import "../chunk-43GMYSS4.js";
 import "../chunk-DINDL2CF.js";
-import "../chunk-NBDU3R3G.js";
+import "../chunk-OSALSIUF.js";
 import "../chunk-BC3VCZ3E.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-ANMHIZZY.js";
+import "../chunk-JW4KO5AF.js";
 import {
   readJsonSafe,
   writeJsonAtomic
 } from "../chunk-4LL6LG5X.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-QINYXLA5.js";
+import "../chunk-VNMKIJZB.js";
 
 // src/bell/install.ts
 import { join } from "path";

package/dist/bin/pushary-claude.js

@@ -7,24 +7,26 @@ import {
 } from "../chunk-YKLCWWEI.js";
 import {
   ensureDaemonRunning
-} from "../chunk-7JZCADBR.js";
+} from "../chunk-F2ICEWZL.js";
 import {
   buildTranscriptRecords,
   decodePublicKey,
   generateSessionKey,
   wrapSessionKey
-} from "../chunk-4IPSMEGT.js";
+} from "../chunk-7FE2KABY.js";
 import {
   fetchTranscriptRecipients,
   uploadTranscriptRecords
 } from "../chunk-QZCFVWA7.js";
 import {
   transcriptsEnabled
-} from "../chunk-M3UABYRT.js";
+} from "../chunk-UZNKVRLE.js";
 import {
+  SESSION_IDLE_TIMEOUT_MS,
+  describeIdleWindow,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-CBGGUEKE.js";
+} from "../chunk-Y6BWPERV.js";
 import {
   needsShell,
   spawnClaude
@@ -36,9 +38,10 @@ import {
 import {
   fetchModeState,
   getPolicy,
+  phoneDrivenEnv,
   repoKeyFor,
   reportEvent
-} from "../chunk-OX35BSPV.js";
+} from "../chunk-4LOPSGLP.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -50,25 +53,25 @@ import {
   removePendingCommand,
   savePendingCommand,
   waitForAnswer
-} from "../chunk-JHJHCMAF.js";
+} from "../chunk-F7OURW3C.js";
 import {
   UNNAMED_ACTION,
   deriveToolTarget,
   describeToolCall,
   scopePathFor
-} from "../chunk-N4QJ3CLX.js";
+} from "../chunk-L4E2BIJ2.js";
 import {
   getMachineId
-} from "../chunk-JTBDBKHU.js";
-import "../chunk-3YGGEDJK.js";
+} from "../chunk-54ELC7D7.js";
+import "../chunk-KUZWXPUS.js";
 import "../chunk-DINDL2CF.js";
-import "../chunk-NBDU3R3G.js";
+import "../chunk-OSALSIUF.js";
 import "../chunk-BC3VCZ3E.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-ANMHIZZY.js";
+import "../chunk-JW4KO5AF.js";
 import "../chunk-4LL6LG5X.js";
 import {
   getApiKey,
@@ -77,7 +80,7 @@ import {
 import {
   KILL_REASON,
   resolveGate
-} from "../chunk-QINYXLA5.js";
+} from "../chunk-VNMKIJZB.js";
 
 // src/wrapper/claudeBinary.ts
 import { statSync } from "fs";
@@ -1367,14 +1370,30 @@ var runLocalLeg = (session, deps = {}) => {
 
 // src/wrapper/remoteLoop.ts
 var errMsg = (err) => err instanceof Error ? err.message : String(err);
+var scheduleWithTimer = (fire, delayMs) => {
+  const timer = setTimeout(fire, delayMs);
+  timer.unref?.();
+  return () => clearTimeout(timer);
+};
+var isTurnActivity = (message) => message.type !== "system" && message.type !== "result";
+var isInit = (message) => message.type === "system" && message.subtype === "init";
 var DEFAULT_MAX_RESTARTS = 5;
 var runRemoteLoop = async (deps) => {
   const maxRestarts = deps.maxRestarts ?? DEFAULT_MAX_RESTARTS;
   const sleep = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
   const backoff = deps.backoffMs ?? ((attempt) => Math.min(1e3 * 2 ** attempt, 15e3));
+  const idleTimeoutMs = deps.idleTimeoutMs ?? SESSION_IDLE_TIMEOUT_MS;
+  const scheduleIdle = deps.scheduleIdle ?? scheduleWithTimer;
   let resumeId = deps.initialResume;
   let totalCost = 0;
   let restarts = 0;
+  let idleExpired = false;
+  let cancelIdle;
+  const disarmIdle = () => {
+    cancelIdle?.();
+    cancelIdle = void 0;
+  };
+  const ended = (exitCode, endedBy) => ({ exitCode, totalCostUsd: totalCost, endedBy });
   while (!deps.signal.aborted) {
     deps.input.detachConsumer();
     let query;
@@ -1392,7 +1411,7 @@ var runRemoteLoop = async (deps) => {
       });
     } catch (err) {
       deps.log?.(`[pushary] remote mode: query failed to start: ${errMsg(err)}`);
-      return { exitCode: 1, totalCostUsd: totalCost };
+      return ended(1, "failed");
     }
     const onAbort = () => {
       deps.input.close();
@@ -1401,10 +1420,24 @@ var runRemoteLoop = async (deps) => {
     };
     if (deps.signal.aborted) onAbort();
     else deps.signal.addEventListener("abort", onAbort, { once: true });
+    let turnOpen = false;
+    const stillResting = (deliveredAtRest) => !turnOpen && deps.input.bufferedCount === 0 && deps.input.stats.delivered === deliveredAtRest;
+    const armIdle = () => {
+      disarmIdle();
+      const deliveredAtRest = deps.input.stats.delivered;
+      cancelIdle = scheduleIdle(() => {
+        cancelIdle = void 0;
+        if (!stillResting(deliveredAtRest)) return;
+        idleExpired = true;
+        deps.log?.(`[pushary] remote mode: no phone instruction for ${describeIdleWindow(idleTimeoutMs)}, ending the session`);
+        onAbort();
+      }, idleTimeoutMs);
+    };
+    const restsAfter = (message) => deps.input.bufferedCount === 0 && (message.type === "result" || isInit(message) && !turnOpen);
     try {
       for await (const message of query) {
         deps.onMessage?.(message);
-        if (message.type === "system" && message.subtype === "init" && typeof message.session_id === "string") {
+        if (isInit(message) && typeof message.session_id === "string") {
           resumeId = message.session_id;
           deps.onSessionId?.(resumeId);
         }
@@ -1412,16 +1445,23 @@ var runRemoteLoop = async (deps) => {
           totalCost = message.total_cost_usd;
           deps.onCost?.(totalCost);
         }
+        if (message.type === "result") turnOpen = false;
+        else if (isTurnActivity(message)) turnOpen = true;
+        if (restsAfter(message)) armIdle();
       }
+      disarmIdle();
       deps.signal.removeEventListener("abort", onAbort);
-      return { exitCode: deps.signal.aborted ? 130 : 0, totalCostUsd: totalCost };
+      if (idleExpired) return ended(0, "idle");
+      return deps.signal.aborted ? ended(130, "aborted") : ended(0, "input-closed");
     } catch (err) {
+      disarmIdle();
       deps.signal.removeEventListener("abort", onAbort);
-      if (deps.signal.aborted) return { exitCode: 130, totalCostUsd: totalCost };
+      if (idleExpired) return ended(0, "idle");
+      if (deps.signal.aborted) return ended(130, "aborted");
       restarts++;
       if (restarts > maxRestarts) {
         deps.log?.(`[pushary] remote mode: too many restarts, giving up: ${errMsg(err)}`);
-        return { exitCode: 1, totalCostUsd: totalCost };
+        return ended(1, "failed");
       }
       deps.log?.(
         `[pushary] remote mode: transient error, resuming session (attempt ${restarts}/${maxRestarts}): ${errMsg(err)}`
@@ -1429,15 +1469,18 @@ var runRemoteLoop = async (deps) => {
       await sleep(backoff(restarts));
     }
   }
-  return { exitCode: 130, totalCostUsd: totalCost };
+  return ended(130, "aborted");
 };
 
 // src/wrapper/remoteLeg.ts
 var CTRL_RIGHT_BRACKET = "";
 var CTRL_C = "";
-var runRemoteLeg = async (session, sdk) => {
+var terminalAttended = () => Boolean(process.stdin.isTTY);
+var runRemoteLeg = async (session, sdk, deps = {}) => {
   const legAbort = new AbortController();
+  const attended = deps.attended ?? terminalAttended();
   let switchBack = false;
+  let idleEnded = false;
   const control = {
     // The running query already drains the shared input queue, so a freshly pushed
     // phone command is delivered without any action here.
@@ -1472,7 +1515,7 @@ var runRemoteLeg = async (session, sdk) => {
       permissionMode: session.permissionMode,
       // The SDK REPLACES the subprocess env; spread process.env and mark the
       // recursion guard so a wrapper-spawned claude cannot re-enter the wrapper.
-      env: { ...process.env, [WRAPPER_ACTIVE_ENV]: "1" },
+      env: phoneDrivenEnv({ ...process.env, [WRAPPER_ACTIVE_ENV]: "1" }),
       cwd: process.cwd(),
       // Run the user's OWN claude (auth + version parity); Windows .cmd shims keep
       // the SDK's bundled binary since the SDK cannot spawn a shim directly.
@@ -1480,13 +1523,20 @@ var runRemoteLeg = async (session, sdk) => {
       onSessionId: (id) => session.setSessionId(id),
       onMessage: (message) => session.streamMessage(message),
       log: (message) => process.stderr.write(`${message}
-`)
+`),
+      idleTimeoutMs: deps.idleTimeoutMs,
+      scheduleIdle: deps.scheduleIdle
     });
     exitCode = result.exitCode;
+    idleEnded = result.endedBy === "idle";
   } finally {
     session.stdin.releaseToChild();
     session.setActiveLeg(null);
   }
+  if (idleEnded && attended) {
+    process.stderr.write("[pushary] handing the terminal back to local mode\n");
+    return "switch";
+  }
   return switchBack ? "switch" : { type: "exit", code: exitCode };
 };
 
@@ -1616,6 +1666,7 @@ var runDualMode = async (binary, args2, startingMode) => {
     if (!sessionId) return Promise.resolve();
     try {
       await ensureOwnership();
+      ownership?.touch();
       await reportEvent(
         { event, agentType: "claude_code", agentName, action, sessionId, machineId, pid: process.pid },
         { maxAttempts: event === "session_start" ? 4 : 2, timeoutMs: 4e3, requireOk: event === "session_start" }

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-VASZ6TWW.js";
+} from "../chunk-FQL5E6NG.js";
 import {
   pusharyHookExecutable
-} from "../chunk-MSTHT2M7.js";
+} from "../chunk-DZDI62LY.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
@@ -22,25 +23,25 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-ZWEKONU6.js";
+} from "../chunk-CELX75MW.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removeGeminiSettings,
   removePusharySettings,
   restoreClaudeMcpServer
-} from "../chunk-JVLB5CAJ.js";
-import "../chunk-B2HND22S.js";
-import "../chunk-VF3RTVWY.js";
+} from "../chunk-GL3FFM7A.js";
+import "../chunk-2LAHXHBR.js";
+import "../chunk-EZIEXHYM.js";
 import {
   disableDaemonService
-} from "../chunk-7JZCADBR.js";
+} from "../chunk-F2ICEWZL.js";
 import "../chunk-XHKBHWLX.js";
 import {
   execNpm
 } from "../chunk-L4ZCFMWW.js";
-import "../chunk-N4QJ3CLX.js";
-import "../chunk-JTBDBKHU.js";
+import "../chunk-L4E2BIJ2.js";
+import "../chunk-54ELC7D7.js";
 import {
   claudeJson,
   claudeMcpReceipt,
@@ -63,14 +64,14 @@ import {
   removeCodexHookTrust,
   removeCodexHooks,
   vscodePluginDir
-} from "../chunk-3YGGEDJK.js";
+} from "../chunk-KUZWXPUS.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-WHDSJ6PD.js";
-import "../chunk-GMJDQDXU.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-QINYXLA5.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
@@ -122,16 +105,7 @@ var APP_OWNED_ENTRIES = [
   // Shared: AgentInstaller.vscodePlugin writes .pushary/plugins/vscode, and so
   // does the CLI. Not attributable, so it is kept whenever the app is installed
   // rather than removed and left registered against a path that is gone.
-  "plugins",
-  // Shared, and the one whose loss is silent. `identity.ts` writes this Mac's id
-  // here and `DeviceIdentity.current()` reads it in preference to its own
-  // UserDefaults copy, precisely so one Mac has one id. Deleting it while the app
-  // is installed does not stop the app: it falls back to the copy it minted
-  // before that reconciliation existed, and the Mac starts reporting two ids that
-  // can never compare equal. A session tagged with the other one is then a
-  // session the app refuses to fetch messages for, and one `TerminalJump` calls
-  // `.onAnotherMachine`.
-  "machine-id"
+  "plugins"
 ];
 var isAppOwned = (name) => APP_OWNED_ENTRIES.includes(name);
 

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

@@ -6,16 +6,19 @@ import {
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-ZP3SNUP7.js";
-import "../chunk-4IPSMEGT.js";
+} from "../chunk-CNPAT3HL.js";
+import "../chunk-7FE2KABY.js";
 import "../chunk-QZCFVWA7.js";
 import {
   transcriptsEnabled
-} from "../chunk-M3UABYRT.js";
+} from "../chunk-UZNKVRLE.js";
 import {
+  SESSION_IDLE_TIMEOUT_MS,
+  describeIdleWindow,
+  idleDeadlinePassed,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-CBGGUEKE.js";
+} from "../chunk-Y6BWPERV.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
@@ -24,17 +27,17 @@ import {
 } from "../chunk-L4ZCFMWW.js";
 import {
   getMachineId
-} from "../chunk-JTBDBKHU.js";
-import "../chunk-3YGGEDJK.js";
-import "../chunk-NBDU3R3G.js";
+} from "../chunk-54ELC7D7.js";
+import "../chunk-KUZWXPUS.js";
+import "../chunk-OSALSIUF.js";
 import "../chunk-BC3VCZ3E.js";
-import "../chunk-ANMHIZZY.js";
+import "../chunk-JW4KO5AF.js";
 import "../chunk-4LL6LG5X.js";
 import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-QINYXLA5.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);