pushary 1.9.66 → 1.9.68

package/dist/bin/pushary-setup.js

@@ -4,7 +4,7 @@ import {
 } from "../chunk-KEPESIIR.js";
 import {
   runBrowserLogin
-} from "../chunk-R7C2FS33.js";
+} from "../chunk-C4EDAHXI.js";
 import {
   INSTALL_NODE_STEP,
   NPM_FILE_IN_USE_STEP,
@@ -17,33 +17,36 @@ import {
   phoneStartServiceState,
   renderCommandSurface,
   unverifiedKeyClosingReason
-} from "../chunk-3FQX74E4.js";
+} from "../chunk-REQO3WWO.js";
 import {
   coworkOutput,
   coworkSelection
-} from "../chunk-EU2ZOZC3.js";
+} from "../chunk-UXN73YAE.js";
 import "../chunk-PUZZELE6.js";
 import {
   clearDeclinedAgent,
   declinedAgentForSetupChoice
-} from "../chunk-XDDSURY3.js";
+} from "../chunk-JPVV27O2.js";
 import {
   describeVersionManagerPin,
   saveSetupFailure,
   versionManagerOf
-} from "../chunk-376TUN72.js";
+} from "../chunk-MMTA7UKA.js";
 import {
+  HERMES_RESTART_COMMAND,
   codexTrustOutcome,
   describeCodexTrustConfirmation,
+  describeHermesInstallFailure,
+  describeHermesState,
   needsCodexTrustStep
-} from "../chunk-4APD2DPI.js";
+} from "../chunk-7SKGS7QN.js";
 import {
   describeWaitLadder
 } from "../chunk-CVWG2N3Y.js";
 import {
   writeJsonError,
   writeStdoutFully
-} from "../chunk-XFQAK35L.js";
+} from "../chunk-VHMZPN3N.js";
 import {
   BROWSER_CONNECT_COMMAND,
   confirmAppConnection,
@@ -52,7 +55,7 @@ import {
   pairingEscapeApplies,
   printConnectInstructions,
   waitForYourPhone
-} from "../chunk-DIUTSF6I.js";
+} from "../chunk-WPOXZPEH.js";
 import "../chunk-3EGEA4KH.js";
 import {
   SETUP_AGENT_NAME,
@@ -60,14 +63,14 @@ import {
   describeRoundTripOutcome,
   roundTripEvidence,
   verifyRoundTrip
-} from "../chunk-MNNQEUQC.js";
+} from "../chunk-AJIT4SCL.js";
 import {
   readManagedControlEvidence,
   waitForMachineReadiness
-} from "../chunk-GWYCKTXS.js";
+} from "../chunk-K4TSXWVX.js";
 import {
   ensureCodexTrustsPusharyHooks
-} from "../chunk-JL3SZJJP.js";
+} from "../chunk-53Q4LRBU.js";
 import {
   describeSetupSideEffects,
   installAgentSkill,
@@ -75,7 +78,7 @@ import {
 } from "../chunk-EUW7JL2K.js";
 import {
   codexEngineBehindLauncher
-} from "../chunk-AVWECJSN.js";
+} from "../chunk-ORHVVRVL.js";
 import "../chunk-XCEN33UP.js";
 import {
   CURSOR_PLUGIN_BACKUP_INFIX,
@@ -85,41 +88,55 @@ import {
   soleGateFile,
   soleGateReceipt,
   soleGateReceiptFile
-} from "../chunk-IGO3AGZK.js";
+} from "../chunk-O655YCOG.js";
 import {
-  HERMES_PIP_PACKAGE,
   describeDetection,
   detectAllAgents,
   isDetected,
-  isHermesConfigReceipt,
   pluginLocationSnippet,
   registerPluginLocation,
-  resolveHermesPython,
-  runHermesConfigScript,
   shortenHome,
   vscodeSettingsTargets
-} from "../chunk-QBNICXMC.js";
+} from "../chunk-LF2NSOAQ.js";
 import {
   mcpServerBearer,
   readMacAppAgentKey
-} from "../chunk-CN6JFM62.js";
+} from "../chunk-PEPRUUGM.js";
+import {
+  keyScopeOf
+} from "../chunk-7V63A4AI.js";
+import {
+  HERMES_CONFIG_FILE,
+  defaultHermesHome,
+  findHermesLauncher,
+  hermesPluginDirectory,
+  hermesReceiptPaths,
+  inspectHermesWiring,
+  installHermesPlugin,
+  isHermesWired,
+  routesHermesQuestions,
+  runsAnOlderPlugin,
+  shippedHermesPlugin
+} from "../chunk-D6W7QDQE.js";
 import {
   setHumanStream
 } from "../chunk-QCGNGEGE.js";
 import {
   FX_PUSHARY_TOOLS_RULE,
   FX_QUESTION_TOOL,
+  cliFxBridgeEntry,
   configureClineServer,
   configureFxSettings,
   fxIgnoresInstructionsFile,
   fxInstructionsBody,
-  fxPusharyEntry,
+  fxOtherHttpServersNote,
   inspectClineInstallation,
   inspectFxInstallation,
+  inspectFxPusharyHttpWiring,
   readFxProfileForSetup,
   withFxPusharyServer,
   writeFxProfile
-} from "../chunk-6ZXCWK27.js";
+} from "../chunk-SL7CIZCL.js";
 import {
   AgentConfigError,
   afterAgentFailureNote,
@@ -132,10 +149,10 @@ import {
   retryAgentCommand,
   writeSetupConfigFile,
   writeSetupConfigJson
-} from "../chunk-5FJDODOA.js";
+} from "../chunk-ODAAK2RZ.js";
 import {
   MCP_BRIDGE_BINARY
-} from "../chunk-HUGVJBDN.js";
+} from "../chunk-53RH3ZIK.js";
 import {
   OPENCODE_HOOK_BINARY,
   addOpenCodeMcpServer,
@@ -153,7 +170,7 @@ import {
   openCodePluginFile,
   openCodeWired,
   withOpenCodeAskRules
-} from "../chunk-7LK3Y6ET.js";
+} from "../chunk-CB4U6WRP.js";
 import {
   ansiPainter,
   createIo,
@@ -169,15 +186,15 @@ import {
   nodeCodexInstallProbe,
   phoneStartIsRequired,
   resolveControlPolicy
-} from "../chunk-T6YLXO6N.js";
+} from "../chunk-VRFFMTIG.js";
 import {
   detectClaudeVersion
-} from "../chunk-MDIGG3Q7.js";
-import "../chunk-RJ6JEHCP.js";
+} from "../chunk-MFWHANKG.js";
+import "../chunk-JAKWPQ2L.js";
 import {
   describeAutoUpdateAnnouncement,
   takeAutoUpdateAnnouncement
-} from "../chunk-VURDLVAQ.js";
+} from "../chunk-7S7NTMDJ.js";
 import {
   addCompatibleHooks,
   addCompatibleMcpServer,
@@ -191,7 +208,7 @@ import {
   compatibleRecord,
   compatibleTargetPaths,
   hasCompatibleHooks
-} from "../chunk-3EZP5ZPS.js";
+} from "../chunk-TVVJ6OYG.js";
 import {
   DAEMON_COLD_START_TIMEOUT_MS,
   clearDaemonNeedsLogin,
@@ -206,7 +223,7 @@ import {
   replaceDaemonService,
   stopDaemonService,
   waitForDaemonRemoteProof
-} from "../chunk-57NTMVMI.js";
+} from "../chunk-EUU5PDUI.js";
 import {
   GEMINI_HOOK_BINARY,
   GEMINI_HOOK_EVENTS,
@@ -222,18 +239,18 @@ import {
   geminiWired,
   planHooks,
   pusharyHookExecutable
-} from "../chunk-YQDCTID4.js";
+} from "../chunk-73DHP3JX.js";
 import {
   AGENT_CHOICES,
   effectiveControlMode,
   effectiveVerify,
   parseSetupOptions
-} from "../chunk-UTAARXYQ.js";
-import "../chunk-IQ3GKPFM.js";
+} from "../chunk-ZK5WYAMI.js";
+import "../chunk-77QP22FL.js";
 import "../chunk-NMUI3ZWG.js";
 import {
   transcriptPreferenceForSetup
-} from "../chunk-XGFFNERF.js";
+} from "../chunk-MUDUWF74.js";
 import "../chunk-XHKBHWLX.js";
 import {
   KEY_FILE_MODE,
@@ -247,7 +264,7 @@ import {
   recordMacAppKeyPrefix,
   resolveShellRc,
   writeKey
-} from "../chunk-CNJ7SI5V.js";
+} from "../chunk-PBEW5CJK.js";
 import {
   CODEX_ENGINE_DIRECTORY,
   CODEX_ENGINE_ENTRYPOINT,
@@ -256,25 +273,25 @@ import {
 } from "../chunk-E46NE7FB.js";
 import {
   reportEvent
-} from "../chunk-2BL6KWN7.js";
-import "../chunk-XXIJBYNW.js";
-import "../chunk-ZAZUDYSF.js";
+} from "../chunk-6IFEYELN.js";
+import "../chunk-GMHQYX3D.js";
+import "../chunk-QYTOYNV2.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-Q5RNYE2L.js";
+import "../chunk-PZZKXX6Q.js";
 import {
   checkApiKey,
   describeKeyCheck,
   samePusharyAccount
-} from "../chunk-QR2QWGQI.js";
-import "../chunk-GECU7V44.js";
-import "../chunk-IA5VWIHV.js";
+} from "../chunk-BSMHSN3Y.js";
+import "../chunk-MHC34X5A.js";
+import "../chunk-2VYQG2HG.js";
 import {
   UsageError
 } from "../chunk-PPY5N2E6.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-XIJTXRWB.js";
+import "../chunk-METUT7V4.js";
 import {
   CLINE_AUTO_APPROVE_STEP,
   CLINE_RELOAD_STEP,
@@ -321,8 +338,6 @@ import {
   guardBinary,
   guardCursorGate,
   guardNodeScript,
-  guardedArgv,
-  hermesConfigReceipt,
   hookTakeoverReceipt,
   isClaudeMcpSnapshot,
   pusharyConfigFile,
@@ -333,7 +348,7 @@ import {
   vscodePluginDir,
   vscodePluginMcp,
   writeInstructionBlock
-} from "../chunk-GDLT32I4.js";
+} from "../chunk-LQAAOXYJ.js";
 import {
   NpmMissingError,
   backupFile,
@@ -346,14 +361,14 @@ import {
   readJsonSafe,
   resolveGlobalBinDir,
   resolveGlobalBinary
-} from "../chunk-KS3O6O7E.js";
+} from "../chunk-NAQCWM4U.js";
 import {
   getBaseUrl
-} from "../chunk-A47UKPC7.js";
+} from "../chunk-32OSSYGZ.js";
 import {
   NPX_LATEST_COMMAND,
   renderCommandHelp
-} from "../chunk-GO7YKPT3.js";
+} from "../chunk-X2MTVD4W.js";
 import {
   getPackageVersion,
   isNewerVersion,
@@ -372,7 +387,7 @@ import {
   isRecord,
   isTimeoutAction,
   isValidApiKey
-} from "../chunk-EJR5JXMV.js";
+} from "../chunk-RQOT6QL3.js";
 import "../chunk-MLKGABMK.js";
 
 // bin/pushary-setup.ts
@@ -393,7 +408,7 @@ var agentSetupTargets = (exists) => ({
   claude_code: [claudeJson(), claudeSettings(), join(claudeSkillDir(), "SKILL.md")],
   codex: [join(codexHome(), "config.toml"), codexHooksJson(), join(codexSkillDir(), "SKILL.md"), codexAgentsMd()],
   gemini_cli: [geminiSettings(), geminiMd()],
-  hermes: [`the Hermes virtualenv (pip install ${HERMES_PIP_PACKAGE})`],
+  hermes: [hermesPluginDirectory(defaultHermesHome()), join(defaultHermesHome(), HERMES_CONFIG_FILE)],
   cursor: [join(cursorPluginDir(), "mcp.json"), cursorUserHooks()],
   vscode: [vscodePluginMcp(), ...vscodeSettingsTargets(exists)],
   opencode: [
@@ -962,7 +977,6 @@ var pairingComputerOf = (host, platform, detectedAgents) => ({
 var CLAUDE_SETTINGS = claudeSettings();
 var CLAUDE_JSON = claudeJson();
 var CLAUDE_MCP_RECEIPT = claudeMcpReceipt();
-var HERMES_CONFIG_RECEIPT = hermesConfigReceipt();
 var CURSOR_PLUGIN_DIR = cursorPluginDir();
 var CURSOR_USER_HOOKS = cursorUserHooks();
 var VSCODE_PLUGIN_DIR = vscodePluginDir();
@@ -1186,60 +1200,56 @@ var setupClaudeCode = async (apiKey) => {
   console.log(`  ${dim("\u2022")} Auto-allowed tools: no permission prompts for Pushary MCP calls`);
 };
 var IS_WINDOWS = process.platform === "win32";
-var ensurePip = (python) => {
-  try {
-    execSync(`"${python}" -m pip --version`, { stdio: "ignore", timeout: 15e3 });
-    return;
-  } catch {
-  }
-  try {
-    execSync(`"${python}" -m ensurepip --upgrade`, { stdio: "pipe", timeout: 6e4 });
-  } catch {
+var keptHermesPluginLine = (folder, pluginDirectory) => folder?.kind === "pushary" ? `  ${check} Plugin ${folder.marker.version} already in ${shortenHome(pluginDirectory)}` : `  ${check} Kept the pushary plugin Hermes installed in ${shortenHome(pluginDirectory)}`;
+var reportHermesInstall = (outcome, version) => {
+  const inspection = outcome.inspection;
+  const folder = inspection.kind === "inspected" ? inspection.folder : null;
+  const pluginDirectory = inspection.kind === "inspected" ? hermesPluginDirectory(inspection.home) : "the Hermes plugins folder";
+  console.log(outcome.folderWritten ? `  ${check} Plugin ${version} written to ${shortenHome(pluginDirectory)}` : keptHermesPluginLine(folder, pluginDirectory));
+  if (outcome.legacyCopyRemoved) console.log(`  ${check} Removed the old pip copy that Hermes would have loaded instead`);
+  console.log();
+  console.log(`  ${dim("What this configured:")}`);
+  console.log(`  ${dim("\u2022")} Native tools: pushary_ask, pushary_notify, pushary_wait, pushary_cancel, pushary_remind, pushary_propose_scope`);
+  console.log(`  ${dim("\u2022")} Approvals: Hermes' dangerous-command prompts go to your phone with allow once / this session / always / deny`);
+  console.log(`  ${dim("\u2022")} Falls back to the terminal prompt when no device is connected, so work never blocks on us`);
+  console.log(folder !== null && routesHermesQuestions(folder) ? `  ${dim("\u2022")} Questions: the plugin sends Hermes' ${bold("clarify")} questions through pushary_ask while it is loaded` : `  ${dim("\u2022")} Questions: this plugin copy leaves Hermes' ${bold("clarify")} questions in the terminal`);
+  console.log(`  ${dim("To send approvals back to the terminal:")} ${bold("hermes config unset security.approval.transport")}`);
+  if (inspection.kind !== "inspected") return;
+  if (inspection.state.kind === "restart_needed" || runsAnOlderPlugin(inspection.state)) {
+    console.log(`  ${yellow("!")} ${describeHermesState(inspection.state)}: ${bold(HERMES_RESTART_COMMAND)}`);
+    noteManual(`Restart Hermes to load the Pushary plugin: ${HERMES_RESTART_COMMAND}`);
+  } else {
+    console.log(`  ${dim(describeHermesState(inspection.state))}`);
   }
 };
-var enablePusharyPlugin = (python) => {
-  return runHermesConfigScript(python, "setup", HERMES_CONFIG_RECEIPT) !== "failed";
-};
 var setupHermes = async (_apiKey) => {
   console.log(`
   ${bold("Setting up Hermes Agent")}
 `);
-  if (!isInstalled("hermes")) {
+  if (!findHermesLauncher()) {
     console.log(`  ${yellow("!")} Hermes CLI not found. Skipping.`);
     console.log(`  ${dim("Install Hermes and re-run setup to configure.")}`);
     return "skipped";
   }
-  const python = resolveHermesPython();
-  if (!python) {
-    console.log(`  ${yellow("!")} Could not locate the Python that Hermes runs in. Skipping.`);
-    noteManual(`Install the Hermes plugin by hand: <hermes-python> -m pip install ${HERMES_PIP_PACKAGE}`);
+  const plugin = shippedHermesPlugin();
+  const receipts = hermesReceiptPaths();
+  const outcomes = [];
+  await spinner("Installing the Pushary plugin into Hermes", async () => {
+    outcomes.push(installHermesPlugin({ installedBy: "cli", plugin, receipts }));
+  });
+  const outcome = outcomes[0] ?? { kind: "no_launcher" };
+  if (outcome.kind === "no_launcher") {
+    console.log(`  ${yellow("!")} Hermes CLI not found. Skipping.`);
     return "skipped";
   }
-  const existingReceipt = readJsonSafe(HERMES_CONFIG_RECEIPT);
-  if (existingReceipt.kind !== "missing" && (existingReceipt.kind !== "ok" || !isHermesConfigReceipt(existingReceipt.value))) {
-    throw new Error(`Cannot safely configure Hermes: ${HERMES_CONFIG_RECEIPT} is unreadable or invalid.`);
-  }
-  await spinner(`Installing ${HERMES_PIP_PACKAGE} into Hermes\u2019 environment`, async () => {
-    ensurePip(python);
-    execSync(`"${python}" -m pip install --upgrade ${HERMES_PIP_PACKAGE}`, { stdio: "pipe", timeout: 18e4 });
-  });
-  let pluginEnabled = false;
-  await spinner("Enabling plugin + routing questions to push", async () => {
-    pluginEnabled = enablePusharyPlugin(python);
-  });
-  if (!pluginEnabled) {
-    console.log(`  ${yellow("!")} Installed the plugin, but could not edit Hermes' config.`);
-    noteManual('Add "pushary" to plugins.enabled and set security.approval.transport to "pushary" (with transport_fallback "builtin") in ~/.hermes/config.yaml, plus "clarify" in agent.disabled_toolsets');
+  if (outcome.kind === "failed") {
+    const message = describeHermesInstallFailure(outcome.reason, shortenHome(hermesPluginDirectory(defaultHermesHome())), shortenHome(receipts.receiptPath));
+    console.log(`  ${yellow("!")} ${message}`);
+    noteManual(message);
+    return "skipped";
   }
-  console.log();
-  console.log(`  ${dim("What this configured:")}`);
-  console.log(`  ${dim("\u2022")} Native tools: pushary_notify, pushary_ask, pushary_wait, pushary_cancel, pushary_propose_scope`);
-  console.log(`  ${dim("\u2022")} Approvals: Hermes' dangerous-command prompts go to your phone with allow once / this session / always / deny`);
-  console.log(`  ${dim("\u2022")} Falls back to the terminal prompt when no device is connected, so work never blocks on us`);
-  console.log(`  ${dim("\u2022")} Questions go to your phone: Hermes' terminal ${bold("clarify")} tool is disabled, so pushary_ask handles every question`);
-  console.log(`  ${dim("\u2022")} Auto-notifications: push alert when tools return errors`);
-  console.log(`  ${dim("To send approvals back to the terminal:")} remove ${bold("security.approval.transport")} from ~/.hermes/config.yaml`);
-  console.log(`  ${dim("To re-enable terminal questions:")} remove ${bold("clarify")} from ${dim("agent.disabled_toolsets")}`);
+  reportHermesInstall(outcome, plugin.version);
+  return "configured";
 };
 var CODEX_HOOKS_JSON = join4(CODEX_HOME, "hooks.json");
 var CODEX_HOOKS_MIN_VERSION = [0, 122, 0];
@@ -1840,10 +1850,12 @@ var setupFx = async () => {
   await installGlobally2();
   await spinner(`Adding the Pushary MCP server (${fxMcpProfile()})`, async () => {
     const profile = readFxProfileForSetup(fxMcpProfile());
-    const bridge = resolveGlobalBinary(MCP_BRIDGE_BINARY) ?? MCP_BRIDGE_BINARY;
-    const entry = fxPusharyEntry(guardedArgv({ kind: "binary", path: bridge, runtime: "node" }));
-    writeFxProfile(fxMcpProfile(), withFxPusharyServer(profile, entry));
+    writeFxProfile(fxMcpProfile(), withFxPusharyServer(profile, cliFxBridgeEntry()));
   });
+  const otherHttpServers = inspectFxPusharyHttpWiring(fxMcpProfile()).otherHttpServers;
+  if (otherHttpServers.length > 0) {
+    console.log(`  ${yellow("!")} ${fxOtherHttpServersNote(otherHttpServers, fxMcpProfile(), retryAgentCommand("fx"))}`);
+  }
   const settingsOutcome = configureFxSettings(fxSettings(), fxQuestionRuleReceipt(), process.env);
   reportFxSettings(settingsOutcome);
   if (teachFxToAskViaPush()) {
@@ -2092,6 +2104,10 @@ var agentIsWired = (agent) => {
       return fxWired();
     case "cline":
       return clineWired();
+    case "hermes": {
+      const inspection = inspectHermesWiring();
+      return inspection.kind === "inspected" && isHermesWired(inspection.state);
+    }
     default: {
       const profile = hookCompatibleProfile(agent);
       if (!profile) return true;
@@ -2650,6 +2666,7 @@ var main = async () => {
   if (!options.dryRun) recordSetupKey(trimmedKey);
   markStep("verify-key");
   const keyCheck = await verifyKeyOrExit(trimmedKey, options, storedKeyCheck ?? void 0);
+  const keyScope = keyScopeOf(keyCheck);
   const wrongAccountHint = wrongAccountHintPlacement({
     canPairWithApp,
     reusedWithoutAsking: reuseAccepted && keyReuse === "announce",
@@ -2869,7 +2886,7 @@ var main = async () => {
     await spinner(prompt.waiting, async () => roundTripSpinnerEnd(await answer));
     roundTrip = await answer;
     markStep(CONNECT_PHONE_STEP);
-    const report = describeRoundTripOutcome(roundTrip, appPlatforms);
+    const report = describeRoundTripOutcome(roundTrip, { appPlatforms, keyScope });
     if (!report.ok) console.log(`  ${yellow("!")} ${report.message}`);
     for (const line of report.next) console.log(`  ${dim(line)}`);
   } else if (verifyMode === "roundtrip" && keyCheck.kind === "ok") {
@@ -3064,7 +3081,7 @@ var main = async () => {
   for (const line of closing.next) console.log(`  ${line}`);
   console.log();
   console.log(`  ${dim("Useful:")}`);
-  for (const line of renderCommandSurface()) console.log(`  ${dim(line)}`);
+  for (const line of renderCommandSurface(keyScope)) console.log(`  ${dim(line)}`);
   console.log();
   const exitCode = closing.exitCode;
   await reportSetupOutcome({

package/dist/bin/pushary-stats.js

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
 import {
   exitOnHelpFlag
-} from "../chunk-G6VJZ3RB.js";
+} from "../chunk-77L2TNJW.js";
 import {
   readLedgerSummary
-} from "../chunk-6BGVSV2Q.js";
+} from "../chunk-7YJSDXLM.js";
 import "../chunk-KZERVKTD.js";
 import {
   getApiKey
-} from "../chunk-A47UKPC7.js";
-import "../chunk-GO7YKPT3.js";
+} from "../chunk-32OSSYGZ.js";
+import "../chunk-X2MTVD4W.js";
 import "../chunk-QTOLNRET.js";
-import "../chunk-EJR5JXMV.js";
+import "../chunk-RQOT6QL3.js";
 import "../chunk-MLKGABMK.js";
 
 // bin/pushary-stats.ts

package/dist/bin/pushary-status.js

@@ -1,76 +1,78 @@
 #!/usr/bin/env node
 import {
   writeJsonError
-} from "../chunk-XFQAK35L.js";
+} from "../chunk-VHMZPN3N.js";
 import {
   fetchChannels
-} from "../chunk-DIUTSF6I.js";
+} from "../chunk-WPOXZPEH.js";
 import "../chunk-3EGEA4KH.js";
 import {
   describeReach,
   reachVerdict
-} from "../chunk-MNNQEUQC.js";
+} from "../chunk-AJIT4SCL.js";
 import {
   describeLastSeen,
   listMachines
-} from "../chunk-GWYCKTXS.js";
-import {
-  CONNECTED_THROUGH_MAC_APP,
-  readMacAppConnectionWhenKeyless
-} from "../chunk-CN6JFM62.js";
-import "../chunk-QCGNGEGE.js";
+} from "../chunk-K4TSXWVX.js";
 import {
   SIGNED_OUT_ON_MAC_MESSAGE,
   activeKeyVerdictOf,
   describeSignedOutKey,
   readSignedOutDiagnosis
-} from "../chunk-YB3HMDKE.js";
-import "../chunk-7LK3Y6ET.js";
+} from "../chunk-P4XZX7CL.js";
+import {
+  CONNECTED_THROUGH_MAC_APP,
+  keyWrittenByMacApp,
+  readMacAppConnectionWhenKeyless
+} from "../chunk-PEPRUUGM.js";
+import "../chunk-7V63A4AI.js";
+import "../chunk-QCGNGEGE.js";
+import "../chunk-CB4U6WRP.js";
 import {
   createIo
 } from "../chunk-FO3MDD26.js";
 import {
   exitOnHelpFlag
-} from "../chunk-G6VJZ3RB.js";
-import "../chunk-T6YLXO6N.js";
-import "../chunk-MDIGG3Q7.js";
-import "../chunk-RJ6JEHCP.js";
-import "../chunk-3EZP5ZPS.js";
-import "../chunk-57NTMVMI.js";
-import "../chunk-YQDCTID4.js";
-import "../chunk-UTAARXYQ.js";
-import "../chunk-IQ3GKPFM.js";
+} from "../chunk-77L2TNJW.js";
+import "../chunk-VRFFMTIG.js";
+import "../chunk-MFWHANKG.js";
+import "../chunk-JAKWPQ2L.js";
+import "../chunk-TVVJ6OYG.js";
+import "../chunk-EUU5PDUI.js";
+import "../chunk-73DHP3JX.js";
+import "../chunk-ZK5WYAMI.js";
+import "../chunk-77QP22FL.js";
 import {
   rejectUnknownFlags
 } from "../chunk-NMUI3ZWG.js";
 import "../chunk-XHKBHWLX.js";
 import {
   readKeySource
-} from "../chunk-CNJ7SI5V.js";
-import "../chunk-2BL6KWN7.js";
-import "../chunk-XXIJBYNW.js";
-import "../chunk-ZAZUDYSF.js";
+} from "../chunk-PBEW5CJK.js";
+import "../chunk-6IFEYELN.js";
+import "../chunk-GMHQYX3D.js";
+import "../chunk-QYTOYNV2.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-Q5RNYE2L.js";
+import "../chunk-PZZKXX6Q.js";
 import {
   checkApiKey,
   describeKeyCheck
-} from "../chunk-QR2QWGQI.js";
-import "../chunk-GECU7V44.js";
-import "../chunk-IA5VWIHV.js";
+} from "../chunk-BSMHSN3Y.js";
+import "../chunk-MHC34X5A.js";
+import "../chunk-2VYQG2HG.js";
 import {
   UsageError
 } from "../chunk-PPY5N2E6.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-XIJTXRWB.js";
-import "../chunk-GDLT32I4.js";
-import "../chunk-KS3O6O7E.js";
-import "../chunk-A47UKPC7.js";
-import "../chunk-GO7YKPT3.js";
+import "../chunk-METUT7V4.js";
+import "../chunk-LQAAOXYJ.js";
+import "../chunk-NAQCWM4U.js";
+import "../chunk-32OSSYGZ.js";
+import "../chunk-X2MTVD4W.js";
 import "../chunk-QTOLNRET.js";
-import "../chunk-EJR5JXMV.js";
+import "../chunk-RQOT6QL3.js";
 import "../chunk-MLKGABMK.js";
 
 // src/status.ts
@@ -263,7 +265,7 @@ var main = async () => {
     keyCheck,
     channels,
     signedOut: readSignedOutDiagnosis(source.key, activeKeyVerdictOf(keyCheck)),
-    macApp: readMacAppConnectionWhenKeyless(source.key)
+    macApp: readMacAppConnectionWhenKeyless(source.key, keyWrittenByMacApp(source.kind === "config" ? source.key : null))
   };
   const report = buildStatusReport(facts);
   if (json) {