@pushary/agent-hooks 1.9.19 → 1.9.20

package/dist/bin/pushary-permission-denied-hook.js

@@ -1,43 +1,43 @@
 #!/usr/bin/env node
 import {
   handlePermissionDenied
-} from "../chunk-TBTCBAQC.js";
+} from "../chunk-DNSYWI7D.js";
 import {
   takeHookHoldBudget
 } from "../chunk-5C2GFTWE.js";
-import "../chunk-23QKUOEV.js";
+import "../chunk-DBEJIFJD.js";
 import "../chunk-736I6CBY.js";
 import {
   readHookInput
-} from "../chunk-T27NT7LJ.js";
-import "../chunk-5LQRUBFB.js";
-import "../chunk-XUUE6MYM.js";
+} from "../chunk-LU7JPQKL.js";
+import "../chunk-6I4D3XZ3.js";
+import "../chunk-PPAMIQOV.js";
 import "../chunk-6WEC3KZP.js";
-import "../chunk-6GQDOO5P.js";
+import "../chunk-HPMP6QQD.js";
 import "../chunk-XGHXQUDG.js";
 import "../chunk-ATDOYZXC.js";
 import "../chunk-2V2CCTGQ.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-E2RXTRM2.js";
-import "../chunk-SEZUF33H.js";
-import "../chunk-YAU4JCYI.js";
+import "../chunk-DF2FSJ7B.js";
+import "../chunk-Q4EQHBA7.js";
+import "../chunk-VOIN2NZW.js";
 import "../chunk-YONHM5BQ.js";
-import "../chunk-7TSL3JCX.js";
+import "../chunk-MMIN6VNU.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
 import "../chunk-4ABHSCFJ.js";
-import "../chunk-NILVJ7HV.js";
+import "../chunk-CW4CF7NU.js";
 import "../chunk-CRW4P7JU.js";
-import "../chunk-DVLQ4TVD.js";
+import "../chunk-K5PUP76V.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-SXVXANPI.js";
-import "../chunk-UAA4BEYM.js";
-import "../chunk-B4OS2OVD.js";
-import "../chunk-KRDQQL2X.js";
+import "../chunk-HILWD7WM.js";
+import "../chunk-NESTNKCA.js";
+import "../chunk-RZCTGLUJ.js";
+import "../chunk-XJGGGDHX.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-MID7BURF.js";
-import "../chunk-FEKP3NJR.js";
+import "../chunk-YJWEQZJC.js";
 import "../chunk-FT7UNIS3.js";
 import "../chunk-XQ4HTTBB.js";
 import "../chunk-LHGB64O2.js";

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

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   handlePermissionRequest
-} from "../chunk-TBTCBAQC.js";
-import "../chunk-23QKUOEV.js";
+} from "../chunk-DNSYWI7D.js";
+import "../chunk-DBEJIFJD.js";
 import "../chunk-736I6CBY.js";
 import {
   readToolHookInput
-} from "../chunk-T27NT7LJ.js";
-import "../chunk-5LQRUBFB.js";
-import "../chunk-XUUE6MYM.js";
+} from "../chunk-LU7JPQKL.js";
+import "../chunk-6I4D3XZ3.js";
+import "../chunk-PPAMIQOV.js";
 import "../chunk-6WEC3KZP.js";
-import "../chunk-6GQDOO5P.js";
+import "../chunk-HPMP6QQD.js";
 import "../chunk-XGHXQUDG.js";
 import "../chunk-ATDOYZXC.js";
 import "../chunk-2V2CCTGQ.js";
@@ -19,28 +19,28 @@ import {
   activeHookSource,
   normalizeToolCall,
   profileFromArgv
-} from "../chunk-E2RXTRM2.js";
-import "../chunk-SEZUF33H.js";
-import "../chunk-YAU4JCYI.js";
+} from "../chunk-DF2FSJ7B.js";
+import "../chunk-Q4EQHBA7.js";
+import "../chunk-VOIN2NZW.js";
 import "../chunk-YONHM5BQ.js";
-import "../chunk-7TSL3JCX.js";
+import "../chunk-MMIN6VNU.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
 import "../chunk-4ABHSCFJ.js";
 import {
   canonicalGateInputs
-} from "../chunk-NILVJ7HV.js";
+} from "../chunk-CW4CF7NU.js";
 import "../chunk-CRW4P7JU.js";
-import "../chunk-DVLQ4TVD.js";
+import "../chunk-K5PUP76V.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-SXVXANPI.js";
-import "../chunk-UAA4BEYM.js";
-import "../chunk-B4OS2OVD.js";
-import "../chunk-KRDQQL2X.js";
+import "../chunk-HILWD7WM.js";
+import "../chunk-NESTNKCA.js";
+import "../chunk-RZCTGLUJ.js";
+import "../chunk-XJGGGDHX.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-MID7BURF.js";
-import "../chunk-FEKP3NJR.js";
+import "../chunk-YJWEQZJC.js";
 import "../chunk-FT7UNIS3.js";
 import "../chunk-XQ4HTTBB.js";
 import "../chunk-LHGB64O2.js";

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

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   readHookInput
-} from "../chunk-T27NT7LJ.js";
-import "../chunk-XUUE6MYM.js";
+} from "../chunk-LU7JPQKL.js";
+import "../chunk-PPAMIQOV.js";
 import "../chunk-6WEC3KZP.js";
-import "../chunk-6GQDOO5P.js";
+import "../chunk-HPMP6QQD.js";
 import "../chunk-XGHXQUDG.js";
 import "../chunk-ATDOYZXC.js";
 import "../chunk-2V2CCTGQ.js";
@@ -14,11 +14,11 @@ import {
   activeIdentity,
   normalizeToolCall,
   profileFromArgv
-} from "../chunk-E2RXTRM2.js";
-import "../chunk-SEZUF33H.js";
-import "../chunk-YAU4JCYI.js";
+} from "../chunk-DF2FSJ7B.js";
+import "../chunk-Q4EQHBA7.js";
+import "../chunk-VOIN2NZW.js";
 import "../chunk-YONHM5BQ.js";
-import "../chunk-7TSL3JCX.js";
+import "../chunk-MMIN6VNU.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
 import "../chunk-4ABHSCFJ.js";
@@ -26,18 +26,18 @@ import {
   handleCompaction,
   handlePostToolUse,
   isCompactionEvent
-} from "../chunk-NILVJ7HV.js";
+} from "../chunk-CW4CF7NU.js";
 import "../chunk-CRW4P7JU.js";
-import "../chunk-DVLQ4TVD.js";
+import "../chunk-K5PUP76V.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-SXVXANPI.js";
-import "../chunk-UAA4BEYM.js";
-import "../chunk-B4OS2OVD.js";
-import "../chunk-KRDQQL2X.js";
+import "../chunk-HILWD7WM.js";
+import "../chunk-NESTNKCA.js";
+import "../chunk-RZCTGLUJ.js";
+import "../chunk-XJGGGDHX.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-MID7BURF.js";
-import "../chunk-FEKP3NJR.js";
+import "../chunk-YJWEQZJC.js";
 import "../chunk-FT7UNIS3.js";
 import "../chunk-XQ4HTTBB.js";
 import "../chunk-LHGB64O2.js";

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

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   readHookInput
-} from "../chunk-T27NT7LJ.js";
-import "../chunk-XUUE6MYM.js";
+} from "../chunk-LU7JPQKL.js";
+import "../chunk-PPAMIQOV.js";
 import "../chunk-6WEC3KZP.js";
-import "../chunk-6GQDOO5P.js";
+import "../chunk-HPMP6QQD.js";
 import "../chunk-XGHXQUDG.js";
 import "../chunk-ATDOYZXC.js";
 import "../chunk-2V2CCTGQ.js";
@@ -12,28 +12,28 @@ import "../chunk-XHKBHWLX.js";
 import {
   activeHookSource,
   activeIdentity
-} from "../chunk-E2RXTRM2.js";
-import "../chunk-SEZUF33H.js";
-import "../chunk-YAU4JCYI.js";
+} from "../chunk-DF2FSJ7B.js";
+import "../chunk-Q4EQHBA7.js";
+import "../chunk-VOIN2NZW.js";
 import "../chunk-YONHM5BQ.js";
-import "../chunk-7TSL3JCX.js";
+import "../chunk-MMIN6VNU.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
 import "../chunk-4ABHSCFJ.js";
 import {
   handleUserPrompt
-} from "../chunk-NILVJ7HV.js";
+} from "../chunk-CW4CF7NU.js";
 import "../chunk-CRW4P7JU.js";
-import "../chunk-DVLQ4TVD.js";
+import "../chunk-K5PUP76V.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-SXVXANPI.js";
-import "../chunk-UAA4BEYM.js";
-import "../chunk-B4OS2OVD.js";
-import "../chunk-KRDQQL2X.js";
+import "../chunk-HILWD7WM.js";
+import "../chunk-NESTNKCA.js";
+import "../chunk-RZCTGLUJ.js";
+import "../chunk-XJGGGDHX.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-MID7BURF.js";
-import "../chunk-FEKP3NJR.js";
+import "../chunk-YJWEQZJC.js";
 import "../chunk-FT7UNIS3.js";
 import "../chunk-XQ4HTTBB.js";
 import "../chunk-LHGB64O2.js";

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

@@ -4,10 +4,10 @@ import {
 } from "../chunk-PQ4K74WL.js";
 import {
   readHookInput
-} from "../chunk-T27NT7LJ.js";
-import "../chunk-XUUE6MYM.js";
+} from "../chunk-LU7JPQKL.js";
+import "../chunk-PPAMIQOV.js";
 import "../chunk-6WEC3KZP.js";
-import "../chunk-6GQDOO5P.js";
+import "../chunk-HPMP6QQD.js";
 import "../chunk-XGHXQUDG.js";
 import "../chunk-ATDOYZXC.js";
 import "../chunk-2V2CCTGQ.js";
@@ -15,28 +15,28 @@ import "../chunk-XHKBHWLX.js";
 import {
   activeHookSource,
   activeIdentity
-} from "../chunk-E2RXTRM2.js";
-import "../chunk-SEZUF33H.js";
-import "../chunk-YAU4JCYI.js";
+} from "../chunk-DF2FSJ7B.js";
+import "../chunk-Q4EQHBA7.js";
+import "../chunk-VOIN2NZW.js";
 import "../chunk-YONHM5BQ.js";
-import "../chunk-7TSL3JCX.js";
+import "../chunk-MMIN6VNU.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
 import "../chunk-4ABHSCFJ.js";
 import {
   handleSessionEnd
-} from "../chunk-NILVJ7HV.js";
+} from "../chunk-CW4CF7NU.js";
 import "../chunk-CRW4P7JU.js";
-import "../chunk-DVLQ4TVD.js";
+import "../chunk-K5PUP76V.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-SXVXANPI.js";
-import "../chunk-UAA4BEYM.js";
-import "../chunk-B4OS2OVD.js";
-import "../chunk-KRDQQL2X.js";
+import "../chunk-HILWD7WM.js";
+import "../chunk-NESTNKCA.js";
+import "../chunk-RZCTGLUJ.js";
+import "../chunk-XJGGGDHX.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-MID7BURF.js";
-import "../chunk-FEKP3NJR.js";
+import "../chunk-YJWEQZJC.js";
 import "../chunk-FT7UNIS3.js";
 import "../chunk-XQ4HTTBB.js";
 import "../chunk-LHGB64O2.js";

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

@@ -1,49 +1,49 @@
 #!/usr/bin/env node
 import {
   reapplyClaudeForVersion
-} from "../chunk-3FG2VCH3.js";
-import "../chunk-W4TZAKOD.js";
+} from "../chunk-EP6FWWBY.js";
+import "../chunk-XDKZZSU6.js";
 import "../chunk-RIVNNBEK.js";
 import {
   triggerAutoUpdate
-} from "../chunk-VCLDXVR3.js";
+} from "../chunk-LB4HVID5.js";
 import {
   readHookInput
-} from "../chunk-T27NT7LJ.js";
-import "../chunk-XUUE6MYM.js";
+} from "../chunk-LU7JPQKL.js";
+import "../chunk-PPAMIQOV.js";
 import "../chunk-6WEC3KZP.js";
-import "../chunk-6GQDOO5P.js";
+import "../chunk-HPMP6QQD.js";
 import "../chunk-XGHXQUDG.js";
 import "../chunk-ATDOYZXC.js";
 import "../chunk-2V2CCTGQ.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-DKFAJHLI.js";
+import "../chunk-XVNZHIVF.js";
 import {
   activeHookSource,
   activeIdentity
-} from "../chunk-E2RXTRM2.js";
-import "../chunk-SEZUF33H.js";
-import "../chunk-YAU4JCYI.js";
+} from "../chunk-DF2FSJ7B.js";
+import "../chunk-Q4EQHBA7.js";
+import "../chunk-VOIN2NZW.js";
 import "../chunk-YONHM5BQ.js";
-import "../chunk-7TSL3JCX.js";
+import "../chunk-MMIN6VNU.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
 import "../chunk-4ABHSCFJ.js";
 import {
   CLAUDE_CODE_AGENT,
   handleSessionStart
-} from "../chunk-NILVJ7HV.js";
+} from "../chunk-CW4CF7NU.js";
 import "../chunk-CRW4P7JU.js";
-import "../chunk-DVLQ4TVD.js";
+import "../chunk-K5PUP76V.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-SXVXANPI.js";
-import "../chunk-UAA4BEYM.js";
-import "../chunk-B4OS2OVD.js";
-import "../chunk-KRDQQL2X.js";
+import "../chunk-HILWD7WM.js";
+import "../chunk-NESTNKCA.js";
+import "../chunk-RZCTGLUJ.js";
+import "../chunk-XJGGGDHX.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-MID7BURF.js";
-import "../chunk-FEKP3NJR.js";
+import "../chunk-YJWEQZJC.js";
 import "../chunk-FT7UNIS3.js";
 import "../chunk-XQ4HTTBB.js";
 import "../chunk-LHGB64O2.js";

package/dist/bin/pushary-setup.js

@@ -10,7 +10,7 @@ import "../chunk-PUZZELE6.js";
 import {
   clearDeclinedAgent,
   declinedAgentForSetupChoice
-} from "../chunk-6TQLZP7F.js";
+} from "../chunk-ANPECDYL.js";
 import {
   CURSOR_GATE_SCRIPT,
   describeVersionManagerPin,
@@ -20,17 +20,17 @@ import {
   codexTrustOutcome,
   describeCodexTrustConfirmation,
   needsCodexTrustStep
-} from "../chunk-SIOYJRL4.js";
+} from "../chunk-OLJ4GIRP.js";
 import {
   writeStdoutFully
 } from "../chunk-EO23EUOK.js";
 import {
   ensureCodexTrustsPusharyHooks
-} from "../chunk-W4TZAKOD.js";
+} from "../chunk-XDKZZSU6.js";
 import {
   readManagedControlEvidence,
   waitForMachineReadiness
-} from "../chunk-TNZYTGAJ.js";
+} from "../chunk-ZNFARGEY.js";
 import {
   describeSetupSideEffects,
   installAgentSkill,
@@ -44,7 +44,7 @@ import {
   soleGateFile,
   soleGateReceipt,
   soleGateReceiptFile
-} from "../chunk-FRZS7XQF.js";
+} from "../chunk-AESHOWIB.js";
 import {
   HERMES_PIP_PACKAGE,
   describeDetection,
@@ -57,7 +57,7 @@ import {
   runHermesConfigScript,
   shortenHome,
   vscodeSettingsTargets
-} from "../chunk-AXG5QMRM.js";
+} from "../chunk-422Z3LBB.js";
 import {
   AgentConfigError,
   FX_PUSHARY_TOOLS_RULE,
@@ -83,10 +83,10 @@ import {
   withFxPusharyServer,
   writeFxProfile,
   writeInstructionBlock
-} from "../chunk-5RMD75P2.js";
+} from "../chunk-N5K5H2AQ.js";
 import {
   MCP_BRIDGE_BINARY
-} from "../chunk-YXYSPMD3.js";
+} from "../chunk-UVEIBBTR.js";
 import {
   checkCodexInstall,
   detectProviderLiveCapabilities,
@@ -94,14 +94,14 @@ import {
   hasSpawnProvider,
   nodeCodexInstallProbe,
   resolveControlPolicy
-} from "../chunk-OWUDBHXW.js";
+} from "../chunk-DQTBQHB5.js";
 import {
   detectClaudeVersion
 } from "../chunk-RIVNNBEK.js";
 import {
   describeAutoUpdateAnnouncement,
   takeAutoUpdateAnnouncement
-} from "../chunk-VCLDXVR3.js";
+} from "../chunk-LB4HVID5.js";
 import {
   DAEMON_COLD_START_TIMEOUT_MS,
   clearDaemonNeedsLogin,
@@ -115,7 +115,7 @@ import {
   replaceDaemonService,
   stopDaemonService,
   waitForDaemonRemoteProof
-} from "../chunk-6GQDOO5P.js";
+} from "../chunk-HPMP6QQD.js";
 import {
   transcriptPreferenceForSetup
 } from "../chunk-2V2CCTGQ.js";
@@ -130,14 +130,14 @@ import {
   printConnectInstructions,
   roundTripEvidence,
   verifyRoundTrip
-} from "../chunk-5PYLU6OS.js";
+} from "../chunk-RGSG2GYV.js";
 import "../chunk-3EGEA4KH.js";
 import {
   setHumanStream
 } from "../chunk-QCGNGEGE.js";
 import {
   readMacAppAgentKey
-} from "../chunk-HYPSYXP4.js";
+} from "../chunk-OZOD37XK.js";
 import {
   OPENCODE_HOOK_BINARY,
   addOpenCodeMcpServer,
@@ -153,7 +153,7 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   openCodeWired
-} from "../chunk-DKFAJHLI.js";
+} from "../chunk-XVNZHIVF.js";
 import {
   ansiPainter,
   createIo,
@@ -175,7 +175,7 @@ import {
   hasCompatibleHooks,
   isClaudeMcpSnapshot,
   updateClaudeMcpSnapshot
-} from "../chunk-E2RXTRM2.js";
+} from "../chunk-DF2FSJ7B.js";
 import {
   KEEP_HINT,
   captureHookTakeover,
@@ -188,19 +188,19 @@ import {
   mcpBearerKey,
   planHooks,
   pusharyHookExecutable
-} from "../chunk-SEZUF33H.js";
+} from "../chunk-Q4EQHBA7.js";
 import {
   GEMINI_HOOK_BINARY,
   addGeminiHooks,
   addGeminiMcpServer
-} from "../chunk-YAU4JCYI.js";
+} from "../chunk-VOIN2NZW.js";
 import {
   AGENT_CHOICES,
   effectiveControlMode,
   effectiveVerify,
   parseSetupOptions
 } from "../chunk-YONHM5BQ.js";
-import "../chunk-7TSL3JCX.js";
+import "../chunk-MMIN6VNU.js";
 import "../chunk-GMXKITVA.js";
 import {
   compareVersion,
@@ -221,18 +221,18 @@ import {
 } from "../chunk-4ABHSCFJ.js";
 import {
   reportEvent
-} from "../chunk-NILVJ7HV.js";
+} from "../chunk-CW4CF7NU.js";
 import "../chunk-CRW4P7JU.js";
-import "../chunk-DVLQ4TVD.js";
+import "../chunk-K5PUP76V.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-SXVXANPI.js";
+import "../chunk-HILWD7WM.js";
 import {
   checkApiKey,
   describeKeyCheck,
   samePusharyAccount
-} from "../chunk-UAA4BEYM.js";
-import "../chunk-B4OS2OVD.js";
-import "../chunk-KRDQQL2X.js";
+} from "../chunk-NESTNKCA.js";
+import "../chunk-RZCTGLUJ.js";
+import "../chunk-XJGGGDHX.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
@@ -284,7 +284,7 @@ import {
   resolveGlobalBinary,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-FEKP3NJR.js";
+} from "../chunk-YJWEQZJC.js";
 import {
   backupFile,
   readJsonSafe,
@@ -545,7 +545,8 @@ var PLAN_CONFIGS = {
 };
 
 // src/setup/key-account.ts
-var agentConfigKeySource = (macAppInstalled) => macAppInstalled ? "mac-app" : "agent-settings";
+var isKeyHeldByMacApp = (key, holder) => holder.macAppInstalled && holder.macAppKey === key;
+var agentConfigKeySource = (agentConfigKey, holder) => isKeyHeldByMacApp(agentConfigKey, holder) ? "mac-app" : "agent-settings";
 var pickReusableKey = (candidates) => {
   if (candidates.storedKey !== null && candidates.storedCheck !== null) {
     return { source: "stored", key: candidates.storedKey, check: candidates.storedCheck };
@@ -554,7 +555,7 @@ var pickReusableKey = (candidates) => {
     return { source: "environment", key: candidates.envKey, check: candidates.envCheck };
   }
   if (candidates.agentConfigKey !== null && candidates.agentConfigCheck !== null) {
-    return { source: agentConfigKeySource(candidates.macAppInstalled), key: candidates.agentConfigKey, check: candidates.agentConfigCheck };
+    return { source: agentConfigKeySource(candidates.agentConfigKey, candidates), key: candidates.agentConfigKey, check: candidates.agentConfigCheck };
   }
   return null;
 };
@@ -572,6 +573,11 @@ var accountHandleOf = (identity) => identity.siteSlug ? `@${identity.siteSlug}`
 var keyAccountHandle = (check2) => check2.kind === "ok" ? accountHandleOf(check2.identity) : null;
 var continueAsQuestion = (account) => account ? `Continue as ${account}?` : "Continue with this key?";
 var WRONG_ACCOUNT_HINT = `Wrong account? Run ${NPX_LATEST_COMMAND} setup --connect app`;
+var wrongAccountHintPlacement = (context) => {
+  if (!context.canPairWithApp) return "none";
+  if (context.planInactive && !context.dryRun) return "with-inactive-plan";
+  return context.reusedWithoutAsking ? "after-key-check" : "none";
+};
 var planNameOf = (plan) => {
   const known = PLAN_TYPES.find((type) => type === plan);
   return known ? PLAN_CONFIGS[known].name : null;
@@ -756,12 +762,15 @@ var describeClosing = (facts) => {
 var RETRY_AGENT_LABEL = "Retry just this agent:";
 var INSTALL_NODE_STEP = "Install the current Node.js LTS, which includes npm, then run setup again.";
 var NPM_PREFIX_STEP = "npm can't install globally here. Use nvm, or run: npm config set prefix ~/.npm-global, then run setup again.";
+var NPM_FILE_IN_USE_STEP = "Close other terminals or editors that use Node, then run setup again.";
 var nextStepFor = (failure) => {
   switch (failure.remedy) {
     case "install-node":
       return { kind: "install-node", instruction: INSTALL_NODE_STEP };
     case "fix-npm-prefix":
       return { kind: "fix-npm-prefix", instruction: NPM_PREFIX_STEP };
+    case "close-node-programs":
+      return { kind: "close-node-programs", instruction: NPM_FILE_IN_USE_STEP };
     case "match-mac-account":
       return { kind: "match-mac-account", instruction: matchMacAccountStep(failure.agent, null) };
     case "retry-agent":
@@ -775,6 +784,7 @@ var describeAgentFailures = (failures, agentName) => failures.map((failure) => (
 var agentFailureFollowUps = (failures) => [
   ...failures.some((failure) => failure.remedy === "install-node") ? ["install-node"] : [],
   ...failures.some((failure) => failure.remedy === "fix-npm-prefix") ? ["fix-npm-prefix"] : [],
+  ...failures.some((failure) => failure.remedy === "close-node-programs") ? ["close-node-programs"] : [],
   ...failures.some((failure) => failure.remedy === "retry-agent") ? ["run-doctor"] : []
 ];
 var unverifiedKeyClosingReason = (facts) => {
@@ -2294,6 +2304,8 @@ var agentFailureFollowUpLine = (followUp) => {
       return INSTALL_NODE_STEP;
     case "fix-npm-prefix":
       return NPM_PREFIX_STEP;
+    case "close-node-programs":
+      return NPM_FILE_IN_USE_STEP;
     case "run-doctor":
       return `${dim("Run")} ${NPX_LATEST_COMMAND} doctor ${dim("for the reason, or send it to")} ${SUPPORT_EMAIL}`;
   }
@@ -2486,7 +2498,8 @@ var main = async () => {
     envCheck,
     agentConfigKey: appKey,
     agentConfigCheck: appKeyCheck,
-    macAppInstalled: appBridgeAvailable
+    macAppInstalled: appBridgeAvailable,
+    macAppKey: readMacAppAgentKey()
   });
   const reuseAccepted = reusable !== null && await acceptReusableKey(reusable, keyReuse);
   const reuseDeclined = reusable !== null && !reuseAccepted;
@@ -2590,7 +2603,13 @@ var main = async () => {
   if (!options.dryRun) recordSetupKey(trimmedKey);
   markStep("verify-key");
   const keyCheck = await verifyKeyOrExit(trimmedKey, options, storedKeyCheck ?? void 0);
-  if (reuseAccepted && keyReuse === "announce") console.log(`  ${dim(WRONG_ACCOUNT_HINT)}`);
+  const wrongAccountHint = wrongAccountHintPlacement({
+    canPairWithApp,
+    reusedWithoutAsking: reuseAccepted && keyReuse === "announce",
+    planInactive: keyCheck.kind === "locked",
+    dryRun: options.dryRun
+  });
+  if (wrongAccountHint === "after-key-check") console.log(`  ${dim(WRONG_ACCOUNT_HINT)}`);
   if (options.dryRun) {
     markStep("resolve-agents");
     const plannedAgents = await resolveAgents(options);
@@ -2796,7 +2815,8 @@ var main = async () => {
   console.log();
   if (keyCheck.kind === "locked" || keyCheck.kind === "unreachable") {
     const report = describeKeyCheck(keyCheck);
-    const next = keyCheck.kind === "locked" ? [...report.next, describeLockedKeyAccount(trimmedKey, pairedHandle), WRONG_ACCOUNT_HINT] : [...report.next, "Finish activation: pushary setup (reuses the saved key)."];
+    const inactivePlanHint = wrongAccountHint === "with-inactive-plan" ? [WRONG_ACCOUNT_HINT] : [];
+    const next = keyCheck.kind === "locked" ? [...report.next, describeLockedKeyAccount(trimmedKey, pairedHandle), ...inactivePlanHint] : [...report.next, "Finish activation: pushary setup (reuses the saved key)."];
     const exitCode2 = failures.length > 0 || controlLifecycleFailure ? EXIT.PROBLEMS_FOUND : report.exitCode;
     printManualSteps();
     console.log(`  ${yellow(bold(keyCheck.kind === "locked" ? "Agents configured, approvals inactive." : "Configuration saved, activation unverified."))}`);