pushary 1.9.20 → 1.9.22

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.9.22
+
+- Each approval Claude Code or Codex sends through Pushary now carries the approval mode the agent reported for the session, such as `default` or `bypassPermissions`, so Pushary can tell which mode an approval was asked in. It is recorded with the approval and never used to decide one. A mode that is empty or not text is left out, and a long one is cut to 64 characters.
+
+## 1.9.21
+
+- `pushary setup` records a key as the one Pushary for Mac is signed in with only when Pushary for Mac holds that same key. It used to record any key it reused from your agent settings that way, including one left behind by an earlier CLI sign-in. `pushary clean` never revokes the Mac app's key, so it skipped that leftover key and left it working. Now it revokes it, and still leaves the Mac app's own key alone.
+- For the same reason, a leftover CLI key is no longer reported as "signed out on this Mac" when it stops working.
+- A key recorded by an earlier version stays recorded until setup saves a different key.
+
 ## 1.9.20
 
 - `pushary setup` calls a key found in your agent settings the Pushary for Mac key only when Pushary for Mac holds that same key. A key left behind by an earlier CLI sign-in is called a key found in your agent settings, also when Pushary for Mac is installed.

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

@@ -1,41 +1,41 @@
 #!/usr/bin/env node
 import {
   handleBell
-} from "../chunk-MGW26CW7.js";
+} from "../chunk-76YNWUXC.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-DF2FSJ7B.js";
-import "../chunk-Q4EQHBA7.js";
-import "../chunk-VOIN2NZW.js";
-import "../chunk-YONHM5BQ.js";
-import "../chunk-MMIN6VNU.js";
+import "../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-CW4CF7NU.js";
-import "../chunk-CRW4P7JU.js";
-import "../chunk-K5PUP76V.js";
+import "../chunk-6IOLTFNP.js";
+import "../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-bell-hook.ts
 var main = async () => {

package/dist/bin/pushary-bell.js

@@ -5,37 +5,39 @@ import {
   liveAgentCount,
   ring,
   upgradeThreshold
-} from "../chunk-MGW26CW7.js";
+} from "../chunk-76YNWUXC.js";
 import {
   createIo
 } from "../chunk-FO3MDD26.js";
 import {
   exitOnHelpFlag
-} from "../chunk-LXYNKZFP.js";
+} from "../chunk-2MW4OHWI.js";
 import {
   addBellHooks,
   bellInstalled,
   removeBellHooks
-} from "../chunk-MMIN6VNU.js";
+} from "../chunk-OZVZGWER.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
-import "../chunk-4ABHSCFJ.js";
+import "../chunk-6IOLTFNP.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-MID7BURF.js";
+import "../chunk-5TLRS3AK.js";
 import {
   claudeSettings
-} from "../chunk-YJWEQZJC.js";
+} from "../chunk-E7EOUEGQ.js";
 import {
   readJsonSafe,
   writeJsonAtomic
-} from "../chunk-FT7UNIS3.js";
-import "../chunk-XQ4HTTBB.js";
-import "../chunk-LHGB64O2.js";
-import "../chunk-6HMCOGKJ.js";
+} from "../chunk-AQFEP65J.js";
+import "../chunk-75MJRC5I.js";
+import "../chunk-TZWZVAMN.js";
+import {
+  isRecord
+} from "../chunk-GFXZDU4V.js";
 
 // bin/pushary-bell.ts
 exitOnHelpFlag("bell");
@@ -48,8 +50,8 @@ var readStdin = async () => {
 var settingsPath = () => claudeSettings();
 var loadSettings = (path) => {
   const existing = readJsonSafe(path);
-  if (existing.kind === "ok") return existing.value;
-  if (existing.kind === "unreadable" || existing.kind === "unparseable") {
+  if (existing.kind === "ok" && isRecord(existing.value)) return existing.value;
+  if (existing.kind !== "missing") {
     throw new Error(`${path} exists but could not be read. Fix or move it, then re-run. Nothing was changed.`);
   }
   return {};

package/dist/bin/pushary-claude.js

@@ -8,39 +8,39 @@ import {
   describeIdleWindow,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-7YTJOWYI.js";
+} from "../chunk-KH2EDRJQ.js";
 import {
   announceSubscriptionRequired,
   isDeferAnswer
-} from "../chunk-6I4D3XZ3.js";
+} from "../chunk-P345G4DK.js";
 import {
   claudeTranscriptPath,
   loadSessionKey,
   registerTranscript,
   registeredTranscriptEnabled
-} from "../chunk-PPAMIQOV.js";
-import "../chunk-6WEC3KZP.js";
+} from "../chunk-LH3GTSXC.js";
+import "../chunk-VTR4VRL2.js";
 import {
   ensureDaemonRunning
-} from "../chunk-HPMP6QQD.js";
+} from "../chunk-N2JP3RKP.js";
 import {
   encryptRecord
-} from "../chunk-XGHXQUDG.js";
-import "../chunk-ATDOYZXC.js";
+} from "../chunk-E3FSKKTJ.js";
+import "../chunk-GNQZY4GL.js";
 import {
   transcriptsEnabled
-} from "../chunk-2V2CCTGQ.js";
+} from "../chunk-WE2RVY7V.js";
 import {
   needsShell,
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
-import "../chunk-Q4EQHBA7.js";
-import "../chunk-VOIN2NZW.js";
-import "../chunk-YONHM5BQ.js";
-import "../chunk-MMIN6VNU.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 {
   DEFAULT_SESSION,
   UNNAMED_ACTION,
@@ -58,8 +58,8 @@ import {
   reportEvent,
   savePendingCommand,
   scopePathFor
-} from "../chunk-CW4CF7NU.js";
-import "../chunk-CRW4P7JU.js";
+} from "../chunk-CW3QUV6B.js";
+import "../chunk-BDV4WDIA.js";
 import {
   askUser,
   cancelQuestion,
@@ -69,35 +69,35 @@ import {
   waitForAnswer,
   waitsForThePhone,
   withdrawQuestion
-} from "../chunk-K5PUP76V.js";
+} from "../chunk-AGIO7SF5.js";
 import "../chunk-POFBE6ZY.js";
 import {
   SubscriptionRequiredError
-} from "../chunk-HILWD7WM.js";
-import "../chunk-NESTNKCA.js";
-import "../chunk-RZCTGLUJ.js";
+} from "../chunk-6SFTI7LM.js";
+import "../chunk-NB2PY5JX.js";
+import "../chunk-WAKQYJ6T.js";
 import {
   getMachineId
-} from "../chunk-XJGGGDHX.js";
+} from "../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-5TLRS3AK.js";
+import "../chunk-E7EOUEGQ.js";
+import "../chunk-AQFEP65J.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-XQ4HTTBB.js";
+} from "../chunk-75MJRC5I.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-LHGB64O2.js";
+} from "../chunk-TZWZVAMN.js";
 import {
   DECISION_STOP_REASON,
   KILL_REASON,
   UNVERIFIABLE_APPROVAL_REASON,
   redactSecretsFromContent,
   resolveGate
-} from "../chunk-6HMCOGKJ.js";
+} from "../chunk-GFXZDU4V.js";
 
 // src/wrapper/localPassthrough.ts
 var SIGNAL_NUMBERS = {

package/dist/bin/pushary-clean.js

@@ -8,12 +8,12 @@ import {
   describeRevokeAttempt,
   keyNoLongerAccepted,
   revokeOwnKey
-} from "../chunk-SB2GN6OP.js";
+} from "../chunk-OYIN77HO.js";
 import {
   isCursorPluginLeftover,
   releaseSoleGate,
   withoutPusharyCursorHooks
-} from "../chunk-AESHOWIB.js";
+} from "../chunk-KCLWVCGN.js";
 import {
   HERMES_PIP_PACKAGE,
   readHermesStatus,
@@ -22,27 +22,27 @@ import {
   shortenHome,
   unregisterPluginLocation,
   vscodeSettingsTargets
-} from "../chunk-422Z3LBB.js";
+} from "../chunk-SGUGGHMC.js";
 import {
   planFxRemoval,
   removeInstructionBlock
-} from "../chunk-N5K5H2AQ.js";
-import "../chunk-UVEIBBTR.js";
+} from "../chunk-XDTYGS6R.js";
+import "../chunk-BDGKWUK2.js";
 import {
   disableDaemonService
-} from "../chunk-HPMP6QQD.js";
+} from "../chunk-N2JP3RKP.js";
 import "../chunk-XHKBHWLX.js";
 import {
   APPROVAL_SETTINGS_PATH
-} from "../chunk-R7SSVBHX.js";
+} from "../chunk-ZUOIDI6M.js";
 import {
   macAppKeepsMcpEntry,
   mcpServerBearer,
   pusharyKey,
   readMacAppAgentKey,
   setupReceiptKey
-} from "../chunk-OZOD37XK.js";
-import "../chunk-2YAHQ763.js";
+} from "../chunk-YPZ4AE2R.js";
+import "../chunk-YODL2CJV.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
@@ -54,14 +54,14 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-XVNZHIVF.js";
+} from "../chunk-U4OWRGYI.js";
 import {
   ansiPainter,
   useColor
 } from "../chunk-FO3MDD26.js";
 import {
   exitOnHelpFlag
-} from "../chunk-LXYNKZFP.js";
+} from "../chunk-2MW4OHWI.js";
 import {
   compatibleConfigFile,
   compatibleInstructionsFile,
@@ -74,7 +74,7 @@ import {
   removePusharySettings,
   removePusharyToolPermissions,
   restoreClaudeMcpServer
-} from "../chunk-DF2FSJ7B.js";
+} from "../chunk-6TSEEKPL.js";
 import {
   hookOwnerOf,
   isHookTakeoverReceipt,
@@ -82,12 +82,12 @@ import {
   resolveBridgeStub,
   restoreHookTakeover,
   restoreMcpServer
-} from "../chunk-Q4EQHBA7.js";
+} from "../chunk-TSFNX5J2.js";
 import {
   removeGeminiSettings
-} from "../chunk-VOIN2NZW.js";
-import "../chunk-YONHM5BQ.js";
-import "../chunk-MMIN6VNU.js";
+} from "../chunk-YGR5PBOF.js";
+import "../chunk-U26CAOZC.js";
+import "../chunk-OZVZGWER.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
@@ -95,27 +95,29 @@ import "../chunk-6ICPEJY5.js";
 import {
   CANDIDATE_RCS,
   findExportedKeyLines,
+  isAdoptedMacAppKey,
   isDisabledExport,
   keyPrefix,
   readConfigFileKey,
+  readKeySource,
   readMacAppKeyPrefix,
   removeClaudeAlias
-} from "../chunk-4ABHSCFJ.js";
-import "../chunk-CW4CF7NU.js";
-import "../chunk-CRW4P7JU.js";
-import "../chunk-K5PUP76V.js";
+} from "../chunk-6IOLTFNP.js";
+import "../chunk-CW3QUV6B.js";
+import "../chunk-BDV4WDIA.js";
+import "../chunk-AGIO7SF5.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-HILWD7WM.js";
+import "../chunk-6SFTI7LM.js";
 import {
   absoluteUrl
-} 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 "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-MID7BURF.js";
+import "../chunk-5TLRS3AK.js";
 import {
   claudeJson,
   claudeMcpReceipt,
@@ -152,14 +154,14 @@ import {
   restoreCodexHookTrust,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-YJWEQZJC.js";
-import "../chunk-FT7UNIS3.js";
+} from "../chunk-E7EOUEGQ.js";
+import "../chunk-AQFEP65J.js";
 import {
   getBaseUrl
-} from "../chunk-XQ4HTTBB.js";
+} from "../chunk-75MJRC5I.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-LHGB64O2.js";
+} from "../chunk-TZWZVAMN.js";
 import {
   CLI_PACKAGE_NAMES,
   HOOK_COMPATIBLE_PROFILES,
@@ -171,7 +173,7 @@ import {
   globalRootFor,
   isValidApiKey,
   redactSecrets
-} from "../chunk-6HMCOGKJ.js";
+} from "../chunk-GFXZDU4V.js";
 
 // bin/pushary-clean.ts
 import { existsSync as existsSync6, readFileSync as readFileSync4, copyFileSync, readdirSync as readdirSync4 } from "fs";
@@ -598,8 +600,8 @@ var cleanCompatibleAgent = (profile, scope, io, home) => {
 };
 
 // src/cli/clean-key-revocation.ts
-var isMacAppKey = (key, keys) => key === keys.macAppKey || keyPrefix(key) === keys.macAppKeyPrefix;
-var revocationFor = (keys) => (key) => isMacAppKey(key, keys) ? { kind: "mac_app_key", keyPrefix: keyPrefix(key) } : { kind: "revoke", key };
+var isMacAppCurrentOrAdoptedKey = (key, keys) => key === keys.macAppKey || isAdoptedMacAppKey(key, keys.macAppKeyPrefix);
+var revocationFor = (keys) => (key) => isMacAppCurrentOrAdoptedKey(key, keys) ? { kind: "mac_app_key", keyPrefix: keyPrefix(key) } : { kind: "revoke", key };
 var validKeys = (keys) => [...new Set(keys)].filter((key) => key !== null && isValidApiKey(key));
 var environmentOnlyKey = (keys, written) => validKeys([keys.envKey]).filter((key) => !written.includes(key)).map((key) => ({ kind: "environment_only", keyPrefix: keyPrefix(key) }));
 var planCliKeyRevocations = (keys) => {
@@ -870,10 +872,11 @@ var printKeyRevocation = (report) => {
 };
 var revokeKeysThisCliHolds = async () => {
   const baseUrl = getBaseUrl();
+  const source = readKeySource();
   const revocations = planCliKeyRevocations({
     configKey: readConfigFileKey(),
     profileKeys: findExportedKeyLines().map((line) => line.key),
-    envKey: process.env.PUSHARY_API_KEY?.trim() || null,
+    envKey: source.kind === "env" ? source.key : null,
     macAppKey: readMacAppAgentKey(),
     macAppKeyPrefix: readMacAppKeyPrefix()
   });

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

@@ -5,10 +5,10 @@ import {
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-A6U4RRFM.js";
+} from "../chunk-DV26ZWUC.js";
 import {
   resolveProviderBinary
-} from "../chunk-DQTBQHB5.js";
+} from "../chunk-UFGU7AK3.js";
 import "../chunk-RIVNNBEK.js";
 import {
   SESSION_IDLE_TIMEOUT_MS,
@@ -16,50 +16,50 @@ import {
   idleDeadlinePassed,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-7YTJOWYI.js";
-import "../chunk-XGHXQUDG.js";
-import "../chunk-ATDOYZXC.js";
+} from "../chunk-KH2EDRJQ.js";
+import "../chunk-E3FSKKTJ.js";
+import "../chunk-GNQZY4GL.js";
 import {
   transcriptsEnabled
-} from "../chunk-2V2CCTGQ.js";
+} from "../chunk-WE2RVY7V.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-4ABHSCFJ.js";
+import "../chunk-6IOLTFNP.js";
 import {
   isAskUserResponse,
   isDecisionStopped,
   isWaitForAnswerResponse,
   withdrawQuestion,
   writeDegraded
-} from "../chunk-K5PUP76V.js";
+} from "../chunk-AGIO7SF5.js";
 import "../chunk-POFBE6ZY.js";
 import {
   callMcpTool
-} from "../chunk-HILWD7WM.js";
-import "../chunk-NESTNKCA.js";
-import "../chunk-RZCTGLUJ.js";
+} from "../chunk-6SFTI7LM.js";
+import "../chunk-NB2PY5JX.js";
+import "../chunk-WAKQYJ6T.js";
 import {
   getMachineId
-} from "../chunk-XJGGGDHX.js";
+} from "../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-5TLRS3AK.js";
+import "../chunk-E7EOUEGQ.js";
+import "../chunk-AQFEP65J.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-XQ4HTTBB.js";
-import "../chunk-LHGB64O2.js";
+} from "../chunk-75MJRC5I.js";
+import "../chunk-TZWZVAMN.js";
 import {
   elicitationContent,
   parseAgentQuestion,
   parseAgentQuestionAnswers,
   planElicitationAsk,
   readElicitationFields
-} from "../chunk-6HMCOGKJ.js";
+} from "../chunk-GFXZDU4V.js";
 
 // bin/pushary-codex-bridge.ts
 import { existsSync } from "fs";