@pushary/agent-hooks 1.9.6 → 1.9.8

package/dist/bin/pushary-session-end-hook.js

@@ -5,47 +5,45 @@ import {
 import {
   activeHookSource,
   activeIdentity
-} from "../chunk-TE5M6GGK.js";
-import "../chunk-IR5FRUPQ.js";
+} from "../chunk-KHNFLYJO.js";
 import {
   readHookInput
-} from "../chunk-HWQNQVY6.js";
-import "../chunk-VRT3EEZN.js";
+} from "../chunk-WWOHTTVP.js";
+import "../chunk-DPGSLWOS.js";
 import "../chunk-SGZJ5LYH.js";
-import "../chunk-NVGDMTX3.js";
-import "../chunk-SPXBXN23.js";
-import "../chunk-SJN22ADZ.js";
-import "../chunk-D7SOOVHX.js";
-import "../chunk-ZC3TF4LR.js";
-import "../chunk-UKNKYTTY.js";
-import "../chunk-Q23MMVTD.js";
-import "../chunk-5AXCOTIT.js";
-import "../chunk-7JTVYR5B.js";
-import "../chunk-KK54WQ74.js";
+import "../chunk-YIG2R3BJ.js";
+import "../chunk-DL7XWKYV.js";
+import "../chunk-LKLVTG3V.js";
+import "../chunk-2QGYMY7A.js";
+import "../chunk-3I6IVOZV.js";
+import "../chunk-WG3K4TCH.js";
+import "../chunk-ZBK6E2OR.js";
+import "../chunk-CLOSJ4ES.js";
+import "../chunk-M6BZZFVQ.js";
 import "../chunk-XHKBHWLX.js";
 import "../chunk-6ICPEJY5.js";
 import {
   handleSessionEnd
-} from "../chunk-CCDVL63C.js";
+} from "../chunk-KRCR2CRQ.js";
 import "../chunk-N6IOSZOE.js";
-import "../chunk-DJ4BB264.js";
-import "../chunk-WN6WYUCV.js";
-import "../chunk-DA4FTGTK.js";
+import "../chunk-CD47ZFFZ.js";
+import "../chunk-2VZAALEJ.js";
+import "../chunk-DKMD6AWR.js";
 import "../chunk-POFBE6ZY.js";
 import "../chunk-GMXKITVA.js";
-import "../chunk-5BHROGRB.js";
-import "../chunk-ZPW4MJOV.js";
-import "../chunk-4QKM44N6.js";
-import "../chunk-W4Q7NFXU.js";
-import "../chunk-3BUAEQCY.js";
+import "../chunk-N4QSPI3B.js";
+import "../chunk-MKTJEXZ3.js";
+import "../chunk-LWOO567I.js";
+import "../chunk-TCQ43LSG.js";
+import "../chunk-DUZVXBBU.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-75CA37FZ.js";
-import "../chunk-HJXZJF6O.js";
+import "../chunk-FQ2GORVG.js";
+import "../chunk-ZBHUHJG6.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-2QRE6QH2.js";
-import "../chunk-L6USMDTW.js";
-import "../chunk-Q4E56K4X.js";
+import "../chunk-5QUPKDI5.js";
+import "../chunk-7DVNSQWF.js";
+import "../chunk-I5IJRMNV.js";
 
 // bin/pushary-session-end-hook.ts
 var AGENT = activeIdentity(process.argv);

package/dist/bin/pushary-session-start-hook.js

@@ -1,57 +1,57 @@
 #!/usr/bin/env node
 import {
   reapplyClaudeForVersion
-} from "../chunk-2I23NFVT.js";
-import "../chunk-IMGJYFCX.js";
+} from "../chunk-MXHTGVFZ.js";
+import "../chunk-3Z3A37WD.js";
+import "../chunk-MGRFDGWU.js";
+import "../chunk-MFF3ONG5.js";
 import {
   activeHookSource,
   activeIdentity
-} from "../chunk-TE5M6GGK.js";
-import "../chunk-IR5FRUPQ.js";
+} from "../chunk-KHNFLYJO.js";
 import "../chunk-RIVNNBEK.js";
 import {
   triggerAutoUpdate
-} from "../chunk-SNJ3BOCP.js";
+} from "../chunk-7PT35RY2.js";
 import {
   readHookInput
-} from "../chunk-HWQNQVY6.js";
-import "../chunk-VRT3EEZN.js";
+} from "../chunk-WWOHTTVP.js";
+import "../chunk-DPGSLWOS.js";
 import "../chunk-SGZJ5LYH.js";
-import "../chunk-NVGDMTX3.js";
-import "../chunk-SPXBXN23.js";
-import "../chunk-SJN22ADZ.js";
-import "../chunk-D7SOOVHX.js";
-import "../chunk-ZC3TF4LR.js";
-import "../chunk-UKNKYTTY.js";
-import "../chunk-Q23MMVTD.js";
-import "../chunk-5AXCOTIT.js";
-import "../chunk-7JTVYR5B.js";
-import "../chunk-KK54WQ74.js";
+import "../chunk-YIG2R3BJ.js";
+import "../chunk-DL7XWKYV.js";
+import "../chunk-LKLVTG3V.js";
+import "../chunk-2QGYMY7A.js";
+import "../chunk-3I6IVOZV.js";
+import "../chunk-WG3K4TCH.js";
+import "../chunk-ZBK6E2OR.js";
+import "../chunk-CLOSJ4ES.js";
+import "../chunk-M6BZZFVQ.js";
 import "../chunk-XHKBHWLX.js";
 import "../chunk-6ICPEJY5.js";
 import {
   CLAUDE_CODE_AGENT,
   handleSessionStart
-} from "../chunk-CCDVL63C.js";
+} from "../chunk-KRCR2CRQ.js";
 import "../chunk-N6IOSZOE.js";
-import "../chunk-DJ4BB264.js";
-import "../chunk-WN6WYUCV.js";
-import "../chunk-DA4FTGTK.js";
+import "../chunk-CD47ZFFZ.js";
+import "../chunk-2VZAALEJ.js";
+import "../chunk-DKMD6AWR.js";
 import "../chunk-POFBE6ZY.js";
 import "../chunk-GMXKITVA.js";
-import "../chunk-5BHROGRB.js";
-import "../chunk-ZPW4MJOV.js";
-import "../chunk-4QKM44N6.js";
-import "../chunk-W4Q7NFXU.js";
-import "../chunk-3BUAEQCY.js";
+import "../chunk-N4QSPI3B.js";
+import "../chunk-MKTJEXZ3.js";
+import "../chunk-LWOO567I.js";
+import "../chunk-TCQ43LSG.js";
+import "../chunk-DUZVXBBU.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-75CA37FZ.js";
-import "../chunk-HJXZJF6O.js";
+import "../chunk-FQ2GORVG.js";
+import "../chunk-ZBHUHJG6.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-2QRE6QH2.js";
-import "../chunk-L6USMDTW.js";
-import "../chunk-Q4E56K4X.js";
+import "../chunk-5QUPKDI5.js";
+import "../chunk-7DVNSQWF.js";
+import "../chunk-I5IJRMNV.js";
 
 // bin/pushary-session-start-hook.ts
 var AGENT = activeIdentity(process.argv);

package/dist/bin/pushary-setup.js

@@ -1,104 +1,119 @@
 #!/usr/bin/env node
-import {
-  codexTrustOutcome,
-  describeCodexTrustConfirmation
-} from "../chunk-JUFKJCZG.js";
 import {
   runBrowserLogin
-} from "../chunk-DGQTJDSJ.js";
+} from "../chunk-NWDG3MSW.js";
 import {
   coworkOutput,
   coworkSelection
-} from "../chunk-CBVDW2N6.js";
+} from "../chunk-B64KHETR.js";
 import "../chunk-PUZZELE6.js";
+import {
+  clearDeclinedAgent,
+  declinedAgentForSetupChoice
+} from "../chunk-BXET3ALR.js";
+import {
+  agentHookFile,
+  agentHookOwner,
+  macAppBridgeAvailable
+} from "../chunk-3Z3A37WD.js";
 import {
   describeVersionManagerPin,
   versionManagerOf
 } from "../chunk-GU3EJCVV.js";
+import {
+  codexTrustOutcome,
+  describeCodexTrustConfirmation,
+  needsCodexTrustStep
+} from "../chunk-6TE27XZR.js";
 import {
   writeStdoutFully
 } from "../chunk-EO23EUOK.js";
 import {
   ensureCodexTrustsPusharyHooks
-} from "../chunk-IMGJYFCX.js";
+} from "../chunk-MGRFDGWU.js";
 import {
   readManagedControlEvidence,
   waitForMachineReadiness
-} from "../chunk-SVTHEMM3.js";
+} from "../chunk-2QTO5YIT.js";
 import {
   describeSetupSideEffects,
   installAgentSkill,
-  installSkillViaSkillsCli,
+  installSkillViaSkillsCli
+} from "../chunk-EUW7JL2K.js";
+import {
+  CURSOR_PLUGIN_BACKUP_INFIX,
+  CURSOR_PLUGIN_STAGING_PREFIX,
   registerCursorGate
-} from "../chunk-6GERGJHF.js";
+} from "../chunk-TCWKTUAE.js";
+import {
+  HERMES_PIP_PACKAGE,
+  describeDetection,
+  detectAllAgents,
+  isDetected,
+  isHermesConfigReceipt,
+  pluginLocationSnippet,
+  registerPluginLocation,
+  resolveHermesPython,
+  runHermesConfigScript,
+  shortenHome,
+  vscodeSettingsTargets
+} from "../chunk-KFF7G225.js";
 import {
   AgentConfigError,
   FX_PUSHARY_TOOLS_RULE,
   FX_QUESTION_TOOL,
-  FX_TOOL_DISCOVERY_NOTE,
-  HERMES_PIP_PACKAGE,
   SHARED_AGENTS_MD_LABEL,
   afterAgentFailureNote,
   agentFailureFromError,
   agentFailureWire,
   configFailureKind,
   configureFxSettings,
-  describeDetection,
   describedAgentFailure,
-  detectAllAgents,
   failedAgentsContext,
   fxIgnoresInstructionsFile,
+  fxInstructionsBody,
   fxPusharyEntry,
   inspectFxInstallation,
-  isDetected,
-  isHermesConfigReceipt,
-  pluginLocationSnippet,
   readFxProfileForSetup,
-  registerPluginLocation,
   renderAgentInstructions,
   renderProjectAgentInstructions,
-  resolveHermesPython,
   retryAgentCommand,
-  runHermesConfigScript,
-  shortenHome,
-  vscodeSettingsTargets,
   withFxPusharyServer,
   writeFxProfile,
   writeInstructionBlock
-} from "../chunk-5PMTC2CB.js";
+} from "../chunk-ZN3C6GBG.js";
 import {
   MCP_BRIDGE_BINARY
-} from "../chunk-WUKUXICK.js";
+} from "../chunk-HRULIYDU.js";
 import {
   OPENCODE_HOOK_BINARY,
   addOpenCodeMcpServer,
   installOpenCodePlugin,
   openCodeConfigDir,
   openCodeConfigFile,
+  openCodeHookArgv,
   openCodeInstructionsFile,
   openCodePluginDir,
   openCodePluginFile,
   openCodeWired
-} from "../chunk-RIC6OOJX.js";
+} from "../chunk-MFF3ONG5.js";
 import {
+  addClaudeMcpServer,
   addCompatibleHooks,
   addCompatibleMcpServer,
   addCompatibleToolPermissions,
+  addPusharyHooks,
+  addPusharyToolPermissions,
+  captureClaudeMcpServer,
   compatibleConfigFile,
   compatibleHookEvents,
   compatibleInstructionsFile,
   compatibleMcpFile,
   compatiblePermissionRuleFile,
-  hasCompatibleHooks
-} from "../chunk-TE5M6GGK.js";
-import {
-  addClaudeMcpServer,
-  addPusharyHooks,
-  addPusharyToolPermissions,
-  captureClaudeMcpServer,
+  hasCompatibleHooks,
   isClaudeMcpSnapshot,
   updateClaudeMcpSnapshot
-} from "../chunk-IR5FRUPQ.js";
+} from "../chunk-KHNFLYJO.js";
 import {
   checkCodexInstall,
   detectProviderLiveCapabilities,
@@ -106,41 +121,31 @@ import {
   hasSpawnProvider,
   nodeCodexInstallProbe,
   resolveControlPolicy
-} from "../chunk-MKJ3RTUS.js";
+} from "../chunk-I6MJXLMY.js";
 import {
   detectClaudeVersion
 } from "../chunk-RIVNNBEK.js";
 import {
   describeAutoUpdateAnnouncement,
   takeAutoUpdateAnnouncement
-} from "../chunk-SNJ3BOCP.js";
+} from "../chunk-7PT35RY2.js";
 import {
   KEEP_HINT,
   captureHookTakeover,
   captureMcpServer,
   describeAppOwnership,
   describeHookOwnership,
-  hookOwnerOf,
   mcpBearerKey,
   planHooks
-} from "../chunk-NVGDMTX3.js";
+} from "../chunk-YIG2R3BJ.js";
 import {
   AGENT_CHOICES,
   effectiveControlMode,
   effectiveVerify,
   parseSetupOptions
-} from "../chunk-SPXBXN23.js";
-import {
-  liveBridgeProbe,
-  resolveBridgeStub
-} from "../chunk-SJN22ADZ.js";
-import {
-  claudeWired,
-  codexWired,
-  geminiWired,
-  pusharyHookExecutable
-} from "../chunk-D7SOOVHX.js";
+} from "../chunk-DL7XWKYV.js";
 import {
+  DAEMON_COLD_START_TIMEOUT_MS,
   clearDaemonNeedsLogin,
   daemonHasRemoteProof,
   daemonServiceDefinitionPath,
@@ -152,16 +157,22 @@ import {
   replaceDaemonService,
   stopDaemonService,
   waitForDaemonRemoteProof
-} from "../chunk-ZC3TF4LR.js";
+} from "../chunk-LKLVTG3V.js";
+import {
+  claudeWired,
+  codexWired,
+  geminiWired,
+  pusharyHookExecutable
+} from "../chunk-2QGYMY7A.js";
 import {
   GEMINI_HOOK_BINARY,
   addGeminiHooks,
   addGeminiMcpServer
-} from "../chunk-UKNKYTTY.js";
-import "../chunk-Q23MMVTD.js";
+} from "../chunk-3I6IVOZV.js";
+import "../chunk-WG3K4TCH.js";
 import {
   transcriptPreferenceForSetup
-} from "../chunk-KK54WQ74.js";
+} from "../chunk-M6BZZFVQ.js";
 import "../chunk-XHKBHWLX.js";
 import {
   compareVersion,
@@ -169,11 +180,11 @@ import {
 } from "../chunk-6ICPEJY5.js";
 import {
   reportEvent
-} from "../chunk-CCDVL63C.js";
+} from "../chunk-KRCR2CRQ.js";
 import "../chunk-N6IOSZOE.js";
-import "../chunk-DJ4BB264.js";
-import "../chunk-WN6WYUCV.js";
-import "../chunk-DA4FTGTK.js";
+import "../chunk-CD47ZFFZ.js";
+import "../chunk-2VZAALEJ.js";
+import "../chunk-DKMD6AWR.js";
 import "../chunk-POFBE6ZY.js";
 import {
   BROWSER_CONNECT_COMMAND,
@@ -185,7 +196,7 @@ import {
   printConnectInstructions,
   roundTripEvidence,
   verifyRoundTrip
-} from "../chunk-YPXUD6DW.js";
+} from "../chunk-IAD2RT4L.js";
 import "../chunk-3EGEA4KH.js";
 import {
   setHumanStream
@@ -205,24 +216,25 @@ import {
   readConfigFileKey,
   readControlMode,
   readKeySource,
+  recordMacAppKeyPrefix,
   resolveShellRc,
   writeKey
-} from "../chunk-5BHROGRB.js";
-import "../chunk-ZPW4MJOV.js";
+} from "../chunk-N4QSPI3B.js";
+import "../chunk-MKTJEXZ3.js";
 import {
   checkApiKey,
   describeKeyCheck,
   samePusharyAccount
-} from "../chunk-4QKM44N6.js";
-import "../chunk-W4Q7NFXU.js";
-import "../chunk-3BUAEQCY.js";
+} from "../chunk-LWOO567I.js";
+import "../chunk-TCQ43LSG.js";
+import "../chunk-DUZVXBBU.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-75CA37FZ.js";
+import "../chunk-FQ2GORVG.js";
 import {
   NpmMissingError,
   addCodexHookTrust,
@@ -261,27 +273,25 @@ import {
   npmErrorMessage,
   plannedGlobalPackage,
   pusharyConfigFile,
-  pusharyDir,
   readCodexMcpAuth,
   resolveGlobalBinDir,
   resolveGlobalBinary,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-HJXZJF6O.js";
+} from "../chunk-ZBHUHJG6.js";
 import {
   backupFile,
   readJsonSafe,
   writeFileAtomic,
   writeJsonAtomic
 } from "../chunk-T7E75EKA.js";
-import "../chunk-2QRE6QH2.js";
+import "../chunk-5QUPKDI5.js";
 import {
   NPX_LATEST_COMMAND,
   renderCommandHelp
-} from "../chunk-L6USMDTW.js";
+} from "../chunk-7DVNSQWF.js";
 import {
   HOOK_COMPATIBLE_PROFILES,
-  HOOK_LOCATOR_BINARY,
   PRETOOLUSE_GATED_TOOLS,
   SUPPORT_EMAIL,
   compatibleTargetFiles,
@@ -293,7 +303,7 @@ import {
   isValidApiKey,
   launchedPackage,
   ownPackageName
-} from "../chunk-Q4E56K4X.js";
+} from "../chunk-I5IJRMNV.js";
 
 // bin/pushary-setup.ts
 import { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync, rmSync, renameSync, realpathSync, statSync, openSync, readSync, closeSync } from "fs";
@@ -346,7 +356,7 @@ var nextSteps = (facts, reachable) => {
     lines.push("pushary claude          launch a managed Claude Code session");
   }
   if (!reachable) {
-    lines.push("pushary connect         connect a phone without re-running setup");
+    lines.push("pushary pair            pair a phone without re-running setup");
   }
   lines.push("pushary doctor          re-check everything");
   return lines;
@@ -1150,6 +1160,9 @@ var setupCodex = async (apiKey) => {
     } else if (trustOutcome === "unverified" && confirmation) {
       console.log(`  ${dim("\u2022")} Hook pre-trusted: no ${cyan("/hooks")} step. If approvals never arrive, ${cyan("/hooks")} re-trusts it`);
       console.log(`    ${dim(describeCodexTrustConfirmation(confirmation))}`);
+    } else if (confirmation && !needsCodexTrustStep(confirmation)) {
+      console.log(`  ${yellow("!")} ${describeCodexTrustConfirmation(confirmation)}`);
+      noteManual(describeCodexTrustConfirmation(confirmation));
     } else {
       if (confirmation) {
         console.log(`  ${yellow("!")} ${describeCodexTrustConfirmation(confirmation)}`);
@@ -1238,8 +1251,8 @@ var setupCursor = async (apiKey) => {
   const source = resolveBundledPlugin();
   if (!source) throw new Error("bundled Cursor plugin not found in this package");
   await spinner("Installing Pushary plugin", async () => {
-    const staging = join3(dirname2(CURSOR_PLUGIN_DIR), `.pushary-staging-${process.pid}`);
-    const backup = `${CURSOR_PLUGIN_DIR}.pushary-backup-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
+    const staging = join3(dirname2(CURSOR_PLUGIN_DIR), `${CURSOR_PLUGIN_STAGING_PREFIX}${process.pid}`);
+    const backup = `${CURSOR_PLUGIN_DIR}${CURSOR_PLUGIN_BACKUP_INFIX}${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
     rmSync(staging, { recursive: true, force: true });
     try {
       cpSync(source, staging, {
@@ -1482,9 +1495,7 @@ var reportFxSettings = (outcome) => {
 };
 var teachFxToAskViaPush = () => {
   if (fxIgnoresInstructionsFile(fxAgentsMd(), fxConfigDir())) return false;
-  writeInstructionBlock(fxAgentsMd(), `${renderAgentInstructions("fx")}
-
-${FX_TOOL_DISCOVERY_NOTE}`);
+  writeInstructionBlock(fxAgentsMd(), fxInstructionsBody());
   return true;
 };
 var fxWired = () => inspectFxInstallation(fxMcpProfile(), fxSettings(), process.env).configured;
@@ -1593,11 +1604,7 @@ var setupOpenCode = async (apiKey) => {
   }
   await installGlobally2();
   await spinner(`Writing the Pushary plugin (${openCodePluginFile()})`, async () => {
-    const target = resolveGlobalBinary(OPENCODE_HOOK_BINARY) ?? OPENCODE_HOOK_BINARY;
-    installOpenCodePlugin(
-      guardedArgv({ kind: "binary", path: target, runtime: "node" }, ["--source", "opencode"]),
-      openCodePluginDir()
-    );
+    installOpenCodePlugin(openCodeHookArgv(resolveGlobalBinary(OPENCODE_HOOK_BINARY)), openCodePluginDir());
   });
   await spinner(`Adding MCP server (${openCodeConfigFile()})`, async () => {
     const config = readAgentJson(openCodeConfigFile());
@@ -1622,24 +1629,9 @@ var compatibleRecord = (of) => HOOK_COMPATIBLE_PROFILES.reduce(
   (record, profile) => ({ ...record, [profile.agentType]: of(profile) }),
   {}
 );
-var HOOK_FILES = {
-  claude_code: () => CLAUDE_SETTINGS,
-  codex: () => CODEX_HOOKS_JSON,
-  gemini_cli: () => GEMINI_SETTINGS,
-  cursor: () => CURSOR_USER_HOOKS,
-  vscode: () => join3(VSCODE_PLUGIN_DIR, "hooks", "hooks.json"),
-  ...compatibleRecord((profile) => () => compatibleConfigFile(profile))
-};
-var hookOwnerFor = (agent, appAvailable = true) => {
-  const file = HOOK_FILES[agent]?.();
-  if (!file) return "none";
-  const document = readJsonSafe(file);
-  const profile = hookCompatibleProfile(agent);
-  return hookOwnerOf(
-    document.kind === "ok" ? document.value : null,
-    appAvailable,
-    profile ? profile.hooksKeyPath : void 0
-  );
+var clearSetupChoiceDecline = (agent) => {
+  const declined = declinedAgentForSetupChoice(agent);
+  if (declined) clearDeclinedAgent(declined);
 };
 var appMcpKeyFor = (agent) => {
   if (agent === "codex") {
@@ -1657,7 +1649,7 @@ var appMcpKeyIfReadable = (agent) => {
   }
 };
 var captureTakeoverReceipt = (agent) => {
-  const hookFile = HOOK_FILES[agent]?.();
+  const hookFile = agentHookFile(agent);
   if (!hookFile) return;
   const document = readAgentJson(hookFile);
   const captured = captureHookTakeover(agent, document);
@@ -2235,12 +2227,10 @@ var main = async () => {
     console.log("  Transcript sync: enabling locally redacted, encrypted sync for Pushary-launched sessions. Your phone can decrypt it; authorized Pushary compliance admins can recover it for documented legal obligations. Disable with pushary setup --transcripts off.");
   }
   const rc = await saveApiKey(trimmedKey, controlMode, transcriptSync);
+  if (trimmedKey === appKey) recordMacAppKeyPrefix(trimmedKey);
   if (keyCheck.kind === "ok") clearDaemonNeedsLogin();
   const context = { rc };
-  const appBridgeAvailable = resolveBridgeStub(
-    join3(pusharyDir(), "bin", HOOK_LOCATOR_BINARY),
-    liveBridgeProbe()
-  ).kind === "bundle";
+  const appBridgeAvailable = macAppBridgeAvailable();
   const accountChecks = /* @__PURE__ */ new Map();
   if (keyCheck) accountChecks.set(trimmedKey, Promise.resolve(keyCheck));
   const accountCheckFor = (key) => {
@@ -2279,7 +2269,7 @@ var main = async () => {
     for (const [index, agent] of agents.entries()) {
       markStep(`configure:${agent}`);
       try {
-        const ownerBefore = hookOwnerFor(agent, appBridgeAvailable);
+        const ownerBefore = agentHookOwner(agent, appBridgeAvailable);
         const plan = planHooks({ owner: ownerBefore, takeOverHooks: options.takeOverHooks, nonInteractive: options.nonInteractive });
         const keepAppWiring = plan === "keep";
         if (keepAppWiring) {
@@ -2297,6 +2287,7 @@ var main = async () => {
   ${check} ${AGENT_NAMES[agent]}: ${describeAppOwnership(AGENT_NAMES[agent])} ${dim(KEEP_HINT)}`);
           hookOwners.push({ agent, owner: "app", kept: true });
           completed.push(agent);
+          clearSetupChoiceDecline(agent);
           continue;
         }
         if (ownerBefore === "app") captureTakeoverReceipt(agent);
@@ -2305,7 +2296,8 @@ var main = async () => {
           skipped.push(agent);
         } else if (agentIsWired(agent)) {
           completed.push(agent);
-          hookOwners.push({ agent, owner: hookOwnerFor(agent, appBridgeAvailable), kept: false });
+          clearSetupChoiceDecline(agent);
+          hookOwners.push({ agent, owner: agentHookOwner(agent, appBridgeAvailable), kept: false });
         } else {
           const failure = describedAgentFailure(agent, "not-wired");
           failures.push(failure);
@@ -2532,7 +2524,7 @@ var main = async () => {
         warnVersionManagerPin(process.execPath);
         controlFailureStage = "daemon-start";
         daemon = await ensureDaemonRunning({ spawnDaemon: () => {
-        } });
+        }, waitTimeoutMs: DAEMON_COLD_START_TIMEOUT_MS });
         if (daemon.kind === "running" || daemon.kind === "started") controlFailureStage = null;
       } else {
         daemon = { kind: "unavailable", detail: service.detail };

package/dist/bin/pushary-stats.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   readLedgerSummary
-} from "../chunk-GQHZIBAZ.js";
+} from "../chunk-ZSTSEBG7.js";
 import {
   exitOnHelpFlag
-} from "../chunk-FBD3QGVJ.js";
+} from "../chunk-CKV3UPMU.js";
 import "../chunk-KZERVKTD.js";
 import {
   getApiKey
-} from "../chunk-2QRE6QH2.js";
-import "../chunk-L6USMDTW.js";
-import "../chunk-Q4E56K4X.js";
+} from "../chunk-5QUPKDI5.js";
+import "../chunk-7DVNSQWF.js";
+import "../chunk-I5IJRMNV.js";
 
 // bin/pushary-stats.ts
 exitOnHelpFlag("stats");