pushary 1.9.20 → 1.9.22

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

@@ -1,43 +1,43 @@
 #!/usr/bin/env node
 import {
   readHookInput
-} from "../chunk-LU7JPQKL.js";
-import "../chunk-PPAMIQOV.js";
-import "../chunk-6WEC3KZP.js";
-import "../chunk-HPMP6QQD.js";
-import "../chunk-XGHXQUDG.js";
-import "../chunk-ATDOYZXC.js";
-import "../chunk-2V2CCTGQ.js";
+} from "../chunk-E7HOX73X.js";
+import "../chunk-LH3GTSXC.js";
+import "../chunk-VTR4VRL2.js";
+import "../chunk-N2JP3RKP.js";
+import "../chunk-E3FSKKTJ.js";
+import "../chunk-GNQZY4GL.js";
+import "../chunk-WE2RVY7V.js";
 import "../chunk-XHKBHWLX.js";
 import {
   activeHookSource,
   activeIdentity
-} from "../chunk-DF2FSJ7B.js";
-import "../chunk-Q4EQHBA7.js";
-import "../chunk-VOIN2NZW.js";
-import "../chunk-YONHM5BQ.js";
-import "../chunk-MMIN6VNU.js";
+} from "../chunk-6TSEEKPL.js";
+import "../chunk-TSFNX5J2.js";
+import "../chunk-YGR5PBOF.js";
+import "../chunk-U26CAOZC.js";
+import "../chunk-OZVZGWER.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-4ABHSCFJ.js";
+import "../chunk-6IOLTFNP.js";
 import {
   handleUserPrompt
-} from "../chunk-CW4CF7NU.js";
-import "../chunk-CRW4P7JU.js";
-import "../chunk-K5PUP76V.js";
+} from "../chunk-CW3QUV6B.js";
+import "../chunk-BDV4WDIA.js";
+import "../chunk-AGIO7SF5.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-HILWD7WM.js";
-import "../chunk-NESTNKCA.js";
-import "../chunk-RZCTGLUJ.js";
-import "../chunk-XJGGGDHX.js";
+import "../chunk-6SFTI7LM.js";
+import "../chunk-NB2PY5JX.js";
+import "../chunk-WAKQYJ6T.js";
+import "../chunk-U2IEM5FF.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-MID7BURF.js";
-import "../chunk-YJWEQZJC.js";
-import "../chunk-FT7UNIS3.js";
-import "../chunk-XQ4HTTBB.js";
-import "../chunk-LHGB64O2.js";
-import "../chunk-6HMCOGKJ.js";
+import "../chunk-5TLRS3AK.js";
+import "../chunk-E7EOUEGQ.js";
+import "../chunk-AQFEP65J.js";
+import "../chunk-75MJRC5I.js";
+import "../chunk-TZWZVAMN.js";
+import "../chunk-GFXZDU4V.js";
 
 // bin/pushary-prompt-hook.ts
 var AGENT = activeIdentity(process.argv);

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

@@ -4,43 +4,43 @@ import {
 } from "../chunk-PQ4K74WL.js";
 import {
   readHookInput
-} from "../chunk-LU7JPQKL.js";
-import "../chunk-PPAMIQOV.js";
-import "../chunk-6WEC3KZP.js";
-import "../chunk-HPMP6QQD.js";
-import "../chunk-XGHXQUDG.js";
-import "../chunk-ATDOYZXC.js";
-import "../chunk-2V2CCTGQ.js";
+} from "../chunk-E7HOX73X.js";
+import "../chunk-LH3GTSXC.js";
+import "../chunk-VTR4VRL2.js";
+import "../chunk-N2JP3RKP.js";
+import "../chunk-E3FSKKTJ.js";
+import "../chunk-GNQZY4GL.js";
+import "../chunk-WE2RVY7V.js";
 import "../chunk-XHKBHWLX.js";
 import {
   activeHookSource,
   activeIdentity
-} from "../chunk-DF2FSJ7B.js";
-import "../chunk-Q4EQHBA7.js";
-import "../chunk-VOIN2NZW.js";
-import "../chunk-YONHM5BQ.js";
-import "../chunk-MMIN6VNU.js";
+} from "../chunk-6TSEEKPL.js";
+import "../chunk-TSFNX5J2.js";
+import "../chunk-YGR5PBOF.js";
+import "../chunk-U26CAOZC.js";
+import "../chunk-OZVZGWER.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-4ABHSCFJ.js";
+import "../chunk-6IOLTFNP.js";
 import {
   handleSessionEnd
-} from "../chunk-CW4CF7NU.js";
-import "../chunk-CRW4P7JU.js";
-import "../chunk-K5PUP76V.js";
+} from "../chunk-CW3QUV6B.js";
+import "../chunk-BDV4WDIA.js";
+import "../chunk-AGIO7SF5.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-HILWD7WM.js";
-import "../chunk-NESTNKCA.js";
-import "../chunk-RZCTGLUJ.js";
-import "../chunk-XJGGGDHX.js";
+import "../chunk-6SFTI7LM.js";
+import "../chunk-NB2PY5JX.js";
+import "../chunk-WAKQYJ6T.js";
+import "../chunk-U2IEM5FF.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-MID7BURF.js";
-import "../chunk-YJWEQZJC.js";
-import "../chunk-FT7UNIS3.js";
-import "../chunk-XQ4HTTBB.js";
-import "../chunk-LHGB64O2.js";
-import "../chunk-6HMCOGKJ.js";
+import "../chunk-5TLRS3AK.js";
+import "../chunk-E7EOUEGQ.js";
+import "../chunk-AQFEP65J.js";
+import "../chunk-75MJRC5I.js";
+import "../chunk-TZWZVAMN.js";
+import "../chunk-GFXZDU4V.js";
 
 // bin/pushary-session-end-hook.ts
 var AGENT = activeIdentity(process.argv);

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

@@ -1,53 +1,53 @@
 #!/usr/bin/env node
 import {
   reapplyClaudeForVersion
-} from "../chunk-EP6FWWBY.js";
-import "../chunk-XDKZZSU6.js";
+} from "../chunk-Z7KB4R6U.js";
+import "../chunk-KCXG2INQ.js";
 import "../chunk-RIVNNBEK.js";
 import {
   triggerAutoUpdate
-} from "../chunk-LB4HVID5.js";
+} from "../chunk-GWKT2ZZS.js";
 import {
   readHookInput
-} from "../chunk-LU7JPQKL.js";
-import "../chunk-PPAMIQOV.js";
-import "../chunk-6WEC3KZP.js";
-import "../chunk-HPMP6QQD.js";
-import "../chunk-XGHXQUDG.js";
-import "../chunk-ATDOYZXC.js";
-import "../chunk-2V2CCTGQ.js";
+} from "../chunk-E7HOX73X.js";
+import "../chunk-LH3GTSXC.js";
+import "../chunk-VTR4VRL2.js";
+import "../chunk-N2JP3RKP.js";
+import "../chunk-E3FSKKTJ.js";
+import "../chunk-GNQZY4GL.js";
+import "../chunk-WE2RVY7V.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-XVNZHIVF.js";
+import "../chunk-U4OWRGYI.js";
 import {
   activeHookSource,
   activeIdentity
-} from "../chunk-DF2FSJ7B.js";
-import "../chunk-Q4EQHBA7.js";
-import "../chunk-VOIN2NZW.js";
-import "../chunk-YONHM5BQ.js";
-import "../chunk-MMIN6VNU.js";
+} from "../chunk-6TSEEKPL.js";
+import "../chunk-TSFNX5J2.js";
+import "../chunk-YGR5PBOF.js";
+import "../chunk-U26CAOZC.js";
+import "../chunk-OZVZGWER.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-4ABHSCFJ.js";
+import "../chunk-6IOLTFNP.js";
 import {
   CLAUDE_CODE_AGENT,
   handleSessionStart
-} from "../chunk-CW4CF7NU.js";
-import "../chunk-CRW4P7JU.js";
-import "../chunk-K5PUP76V.js";
+} from "../chunk-CW3QUV6B.js";
+import "../chunk-BDV4WDIA.js";
+import "../chunk-AGIO7SF5.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-HILWD7WM.js";
-import "../chunk-NESTNKCA.js";
-import "../chunk-RZCTGLUJ.js";
-import "../chunk-XJGGGDHX.js";
+import "../chunk-6SFTI7LM.js";
+import "../chunk-NB2PY5JX.js";
+import "../chunk-WAKQYJ6T.js";
+import "../chunk-U2IEM5FF.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-MID7BURF.js";
-import "../chunk-YJWEQZJC.js";
-import "../chunk-FT7UNIS3.js";
-import "../chunk-XQ4HTTBB.js";
-import "../chunk-LHGB64O2.js";
-import "../chunk-6HMCOGKJ.js";
+import "../chunk-5TLRS3AK.js";
+import "../chunk-E7EOUEGQ.js";
+import "../chunk-AQFEP65J.js";
+import "../chunk-75MJRC5I.js";
+import "../chunk-TZWZVAMN.js";
+import "../chunk-GFXZDU4V.js";
 
 // bin/pushary-session-start-hook.ts
 var AGENT = activeIdentity(process.argv);

package/dist/bin/pushary-setup.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   runBrowserLogin
-} from "../chunk-BIQF3C4H.js";
+} from "../chunk-YR3DHPYI.js";
 import {
   coworkOutput,
   coworkSelection
-} from "../chunk-Z4YQ7ZMO.js";
+} from "../chunk-YI543EKI.js";
 import "../chunk-PUZZELE6.js";
 import {
   clearDeclinedAgent,
   declinedAgentForSetupChoice
-} from "../chunk-ANPECDYL.js";
+} from "../chunk-ARJSQUIS.js";
 import {
   CURSOR_GATE_SCRIPT,
   describeVersionManagerPin,
@@ -20,17 +20,17 @@ import {
   codexTrustOutcome,
   describeCodexTrustConfirmation,
   needsCodexTrustStep
-} from "../chunk-OLJ4GIRP.js";
+} from "../chunk-3BWW4UMT.js";
 import {
   writeStdoutFully
 } from "../chunk-EO23EUOK.js";
 import {
   ensureCodexTrustsPusharyHooks
-} from "../chunk-XDKZZSU6.js";
+} from "../chunk-KCXG2INQ.js";
 import {
   readManagedControlEvidence,
   waitForMachineReadiness
-} from "../chunk-ZNFARGEY.js";
+} from "../chunk-4AO2OVUA.js";
 import {
   describeSetupSideEffects,
   installAgentSkill,
@@ -44,7 +44,7 @@ import {
   soleGateFile,
   soleGateReceipt,
   soleGateReceiptFile
-} from "../chunk-AESHOWIB.js";
+} from "../chunk-KCLWVCGN.js";
 import {
   HERMES_PIP_PACKAGE,
   describeDetection,
@@ -57,7 +57,7 @@ import {
   runHermesConfigScript,
   shortenHome,
   vscodeSettingsTargets
-} from "../chunk-422Z3LBB.js";
+} from "../chunk-SGUGGHMC.js";
 import {
   AgentConfigError,
   FX_PUSHARY_TOOLS_RULE,
@@ -83,10 +83,10 @@ import {
   withFxPusharyServer,
   writeFxProfile,
   writeInstructionBlock
-} from "../chunk-N5K5H2AQ.js";
+} from "../chunk-XDTYGS6R.js";
 import {
   MCP_BRIDGE_BINARY
-} from "../chunk-UVEIBBTR.js";
+} from "../chunk-BDGKWUK2.js";
 import {
   checkCodexInstall,
   detectProviderLiveCapabilities,
@@ -94,14 +94,14 @@ import {
   hasSpawnProvider,
   nodeCodexInstallProbe,
   resolveControlPolicy
-} from "../chunk-DQTBQHB5.js";
+} from "../chunk-UFGU7AK3.js";
 import {
   detectClaudeVersion
 } from "../chunk-RIVNNBEK.js";
 import {
   describeAutoUpdateAnnouncement,
   takeAutoUpdateAnnouncement
-} from "../chunk-LB4HVID5.js";
+} from "../chunk-GWKT2ZZS.js";
 import {
   DAEMON_COLD_START_TIMEOUT_MS,
   clearDaemonNeedsLogin,
@@ -115,10 +115,10 @@ import {
   replaceDaemonService,
   stopDaemonService,
   waitForDaemonRemoteProof
-} from "../chunk-HPMP6QQD.js";
+} from "../chunk-N2JP3RKP.js";
 import {
   transcriptPreferenceForSetup
-} from "../chunk-2V2CCTGQ.js";
+} from "../chunk-WE2RVY7V.js";
 import "../chunk-XHKBHWLX.js";
 import {
   BROWSER_CONNECT_COMMAND,
@@ -130,14 +130,15 @@ import {
   printConnectInstructions,
   roundTripEvidence,
   verifyRoundTrip
-} from "../chunk-RGSG2GYV.js";
+} from "../chunk-G5YMVGAK.js";
 import "../chunk-3EGEA4KH.js";
 import {
   setHumanStream
 } from "../chunk-QCGNGEGE.js";
 import {
+  mcpServerBearer,
   readMacAppAgentKey
-} from "../chunk-OZOD37XK.js";
+} from "../chunk-YPZ4AE2R.js";
 import {
   OPENCODE_HOOK_BINARY,
   addOpenCodeMcpServer,
@@ -153,7 +154,7 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   openCodeWired
-} from "../chunk-XVNZHIVF.js";
+} from "../chunk-U4OWRGYI.js";
 import {
   ansiPainter,
   createIo,
@@ -175,7 +176,7 @@ import {
   hasCompatibleHooks,
   isClaudeMcpSnapshot,
   updateClaudeMcpSnapshot
-} from "../chunk-DF2FSJ7B.js";
+} from "../chunk-6TSEEKPL.js";
 import {
   KEEP_HINT,
   captureHookTakeover,
@@ -185,22 +186,21 @@ import {
   describeAppOwnership,
   describeHookOwnership,
   geminiWired,
-  mcpBearerKey,
   planHooks,
   pusharyHookExecutable
-} from "../chunk-Q4EQHBA7.js";
+} from "../chunk-TSFNX5J2.js";
 import {
   GEMINI_HOOK_BINARY,
   addGeminiHooks,
   addGeminiMcpServer
-} from "../chunk-VOIN2NZW.js";
+} from "../chunk-YGR5PBOF.js";
 import {
   AGENT_CHOICES,
   effectiveControlMode,
   effectiveVerify,
   parseSetupOptions
-} from "../chunk-YONHM5BQ.js";
-import "../chunk-MMIN6VNU.js";
+} from "../chunk-U26CAOZC.js";
+import "../chunk-OZVZGWER.js";
 import "../chunk-GMXKITVA.js";
 import {
   compareVersion,
@@ -218,28 +218,28 @@ import {
   recordMacAppKeyPrefix,
   resolveShellRc,
   writeKey
-} from "../chunk-4ABHSCFJ.js";
+} from "../chunk-6IOLTFNP.js";
 import {
   reportEvent
-} from "../chunk-CW4CF7NU.js";
-import "../chunk-CRW4P7JU.js";
-import "../chunk-K5PUP76V.js";
+} from "../chunk-CW3QUV6B.js";
+import "../chunk-BDV4WDIA.js";
+import "../chunk-AGIO7SF5.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-HILWD7WM.js";
+import "../chunk-6SFTI7LM.js";
 import {
   checkApiKey,
   describeKeyCheck,
   samePusharyAccount
-} from "../chunk-NESTNKCA.js";
-import "../chunk-RZCTGLUJ.js";
-import "../chunk-XJGGGDHX.js";
+} from "../chunk-NB2PY5JX.js";
+import "../chunk-WAKQYJ6T.js";
+import "../chunk-U2IEM5FF.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-MID7BURF.js";
+import "../chunk-5TLRS3AK.js";
 import {
   NpmMissingError,
   addCodexHookTrust,
@@ -284,18 +284,18 @@ import {
   resolveGlobalBinary,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-YJWEQZJC.js";
+} from "../chunk-E7EOUEGQ.js";
 import {
   backupFile,
   readJsonSafe,
   writeFileAtomic,
   writeJsonAtomic
-} from "../chunk-FT7UNIS3.js";
-import "../chunk-XQ4HTTBB.js";
+} from "../chunk-AQFEP65J.js";
+import "../chunk-75MJRC5I.js";
 import {
   NPX_LATEST_COMMAND,
   renderCommandHelp
-} from "../chunk-LHGB64O2.js";
+} from "../chunk-TZWZVAMN.js";
 import {
   HOOK_COMPATIBLE_PROFILES,
   PRETOOLUSE_GATED_TOOLS,
@@ -306,10 +306,11 @@ import {
   hookCompatibleProfile,
   isComputerAgent,
   isNewerVersion,
+  isRecord,
   isValidApiKey,
   launchedPackage,
   ownPackageName
-} from "../chunk-6HMCOGKJ.js";
+} from "../chunk-GFXZDU4V.js";
 
 // bin/pushary-setup.ts
 import { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync, rmSync, renameSync, realpathSync, statSync, openSync, readSync, closeSync } from "fs";
@@ -954,7 +955,6 @@ var pickAppKey = (candidates) => candidates.fromAgents.find(
 ) ?? null;
 
 // src/vscode-gate-hooks.ts
-var isRecord = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 var runsTheGate = (entry) => typeof entry.command === "string" && (pusharyHookExecutable(entry.command)?.endsWith(CURSOR_GATE_SCRIPT) ?? false);
 var guardedEntry = (entry, command) => isRecord(entry) && runsTheGate(entry) ? { ...entry, command } : entry;
 var guardVsCodeGateHooks = (document, gateScript) => {
@@ -1055,14 +1055,19 @@ var readJson = (filePath) => {
     return {};
   }
 };
+var AGENT_JSON_REFUSAL = {
+  unparseable: "is not valid JSON",
+  unreadable: "could not be read",
+  "not-an-object": "is not a JSON object"
+};
 var readAgentJson = (filePath) => {
   const result = readJsonSafe(filePath);
-  if (result.kind === "ok") return result.value;
+  if (result.kind === "ok" && isRecord(result.value)) return result.value;
   if (result.kind === "missing") return {};
   const backup = backupFile(filePath);
-  const reason = result.kind === "unparseable" ? "is not valid JSON" : "could not be read";
+  const reason = AGENT_JSON_REFUSAL[result.kind === "ok" ? "not-an-object" : result.kind];
   throw new AgentConfigError(
-    configFailureKind(result.kind),
+    configFailureKind(result.kind === "unreadable" ? "unreadable" : "unparseable"),
     filePath,
     `${filePath} ${reason}, so it was left untouched. A copy is at ${backup}. Fix or remove the original, then re-run setup.`
   );
@@ -1531,7 +1536,7 @@ var installCursorUserHooks = (gateScript) => {
   let userHooks = {};
   if (existsSync(CURSOR_USER_HOOKS)) {
     const result = readJsonSafe(CURSOR_USER_HOOKS);
-    if (result.kind === "ok") userHooks = result.value;
+    if (result.kind === "ok" && isRecord(result.value)) userHooks = result.value;
     else if (result.kind !== "missing") {
       let backup = "";
       try {
@@ -1539,13 +1544,13 @@ var installCursorUserHooks = (gateScript) => {
       } catch {
       }
       throw new AgentConfigError(
-        configFailureKind(result.kind),
+        configFailureKind(result.kind === "unreadable" ? "unreadable" : "unparseable"),
         CURSOR_USER_HOOKS,
         `Could not parse or read Cursor hooks.json; left it untouched${backup ? ` and backed it up at ${backup}` : ""}. Fix the file, then re-run setup.`
       );
     }
   }
-  const hooks = userHooks.hooks ?? {};
+  const hooks = isRecord(userHooks.hooks) ? userHooks.hooks : {};
   for (const event of Object.keys(bundled)) {
     const template = bundled[event]?.[0];
     if (!template) throw new Error(`bundled Cursor hooks.json missing a ${event} entry`);
@@ -1976,7 +1981,7 @@ var appMcpKeyFor = (agent) => {
     return auth?.method === "embedded" ? auth.key : null;
   }
   const entry = APP_MCP_ENTRIES[agent];
-  return entry ? mcpBearerKey(readAgentJson(entry.file()), entry.container, "headers") : null;
+  return entry ? mcpServerBearer(readAgentJson(entry.file())[entry.container]) : null;
 };
 var appWiringAccountKeyFor = (agent) => MAC_APP_DEVICE_KEY_AGENTS.has(agent) ? readMacAppAgentKey() : appMcpKeyFor(agent);
 var appMcpKeyIfReadable = (agent) => {
@@ -2491,6 +2496,7 @@ var main = async () => {
     dryRun: options.dryRun,
     canPairWithApp
   });
+  const macAppHolder = { macAppInstalled: appBridgeAvailable, macAppKey: readMacAppAgentKey() };
   const reusable = pickReusableKey({
     storedKey,
     storedCheck,
@@ -2498,8 +2504,7 @@ var main = async () => {
     envCheck,
     agentConfigKey: appKey,
     agentConfigCheck: appKeyCheck,
-    macAppInstalled: appBridgeAvailable,
-    macAppKey: readMacAppAgentKey()
+    ...macAppHolder
   });
   const reuseAccepted = reusable !== null && await acceptReusableKey(reusable, keyReuse);
   const reuseDeclined = reusable !== null && !reuseAccepted;
@@ -2624,7 +2629,7 @@ var main = async () => {
     console.log(`  ${TRANSCRIPT_SYNC_NOTICE}`);
   }
   const rc = await saveApiKey(trimmedKey, controlMode, transcriptSync);
-  if (trimmedKey === appKey) recordMacAppKeyPrefix(trimmedKey);
+  if (isKeyHeldByMacApp(trimmedKey, macAppHolder)) recordMacAppKeyPrefix(trimmedKey);
   if (keyCheck.kind === "ok") clearDaemonNeedsLogin();
   markStep("resolve-agents");
   const agents = await resolveAgents(options);

package/dist/bin/pushary-stats.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   readLedgerSummary
-} from "../chunk-736I6CBY.js";
+} from "../chunk-T57BCGHQ.js";
 import {
   exitOnHelpFlag
-} from "../chunk-LXYNKZFP.js";
+} from "../chunk-2MW4OHWI.js";
 import "../chunk-KZERVKTD.js";
 import {
   getApiKey
-} from "../chunk-XQ4HTTBB.js";
-import "../chunk-LHGB64O2.js";
-import "../chunk-6HMCOGKJ.js";
+} from "../chunk-75MJRC5I.js";
+import "../chunk-TZWZVAMN.js";
+import "../chunk-GFXZDU4V.js";
 
 // bin/pushary-stats.ts
 exitOnHelpFlag("stats");