@pushary/agent-hooks 1.9.7 → 1.9.9

package/dist/bin/pushary-disconnect.js

@@ -1,76 +1,109 @@
 #!/usr/bin/env node
 import {
-  compatibleConfigFile,
-  compatibleMcpFile,
-  compatiblePermissionRuleFile,
-  removeCompatibleHooks,
-  removeCompatibleMcpServer
-} from "../chunk-MZPXVH4A.js";
+  declinedAgentsFile,
+  recordDeclinedAgent
+} from "../chunk-EIAEUG7G.js";
+import {
+  isCursorPluginLeftover,
+  isPusharyCursorPluginManifest
+} from "../chunk-LENBKYRB.js";
+import {
+  planFxRemoval,
+  removeInstructionBlock
+} from "../chunk-6W5M3MSE.js";
+import "../chunk-H5T27W7M.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
   hasForeignPlugins,
   isOpenCodePluginOurs,
+  macAppBridgeAvailable,
   openCodeConfigFile,
+  openCodeInstructionsFile,
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-X5NXPCIC.js";
+} from "../chunk-BZLHTMT6.js";
 import {
+  compatibleConfigFile,
+  compatibleInstructionsFile,
+  compatibleMcpFile,
+  compatiblePermissionRuleFile,
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
+  removeCompatibleHooks,
+  removeCompatibleMcpServer,
   removePusharySettings,
   removePusharyToolPermissions,
   restoreClaudeMcpServer
-} from "../chunk-ANEAA37E.js";
+} from "../chunk-UF6RBP5V.js";
+import {
+  exitOnHelpFlag
+} from "../chunk-TO3PS646.js";
+import "../chunk-BYLKCZ2G.js";
 import {
   removeGeminiSettings
-} from "../chunk-JCWZ23MJ.js";
+} from "../chunk-M3STIAGU.js";
+import "../chunk-ZGADIZDS.js";
+import "../chunk-MLGIVVSG.js";
+import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-QFEM7R6T.js";
+import "../chunk-REU2VQPH.js";
+import "../chunk-KQFTBQ66.js";
 import "../chunk-N6IOSZOE.js";
-import "../chunk-6DJTDHBI.js";
-import "../chunk-D6S5EKXA.js";
-import "../chunk-AVNKVF7N.js";
+import "../chunk-MD4SVNT6.js";
+import "../chunk-WRPYCIV2.js";
+import "../chunk-6AYSKVLL.js";
+import "../chunk-QRXPWW3M.js";
+import "../chunk-UPIZSCYD.js";
 import "../chunk-POFBE6ZY.js";
-import {
-  exitOnHelpFlag
-} from "../chunk-UFVGSEWH.js";
-import "../chunk-L76HTPU6.js";
-import "../chunk-KFKL3FHS.js";
-import "../chunk-JXISQ7DT.js";
-import "../chunk-KYO45G5L.js";
+import "../chunk-5N5L6DNN.js";
+import "../chunk-KOWFRUIT.js";
 import "../chunk-7QLSKOSU.js";
-import "../chunk-KZERVKTD.js";
-import "../chunk-4D2AYNSE.js";
+import {
+  EXIT
+} from "../chunk-KZERVKTD.js";
+import "../chunk-BNSKVIAW.js";
 import {
   claudeJson,
   claudeMcpReceipt,
   claudeSettings,
   claudeSettingsLocal,
+  codexAgentsMd,
   codexConfigToml,
   codexHookPositions,
   codexHooksJson,
+  cursorPluginDir,
+  cursorPluginManifest,
   cursorUserHooks,
   cursorUserMcp,
+  fxAgentsMd,
+  fxMcpProfile,
+  fxQuestionRuleReceipt,
+  fxSettings,
+  geminiMd,
   geminiSettings,
   removeCodexHooks,
   removeCodexSettings
-} from "../chunk-ZUTU43FT.js";
+} from "../chunk-Z23ZBYDW.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-Z6HPS67T.js";
-import "../chunk-STQRUH3S.js";
+import "../chunk-IRHABAQT.js";
+import {
+  isInvocationOf
+} from "../chunk-5DCDQ5VW.js";
 import {
   DISCONNECTABLE_AGENTS,
-  hookCompatibleProfileBySource
-} from "../chunk-QR6VE5ME.js";
+  DISCONNECT_AGENT_IDS,
+  hookCompatibleProfileBySource,
+  normalizeAgentId
+} from "../chunk-5RGA636G.js";
 
 // bin/pushary-disconnect.ts
 import { readdirSync, readFileSync, rmSync, writeFileSync } from "fs";
 import { parse as parseTOML, stringify as stringifyTOML } from "smol-toml";
 
 // src/disconnect.ts
-import { dirname } from "path";
+import { dirname, join } from "path";
 var isDisconnectableAgent = (value) => DISCONNECTABLE_AGENTS.includes(value);
 var removeCursorHooks = (config) => {
   const hooks = config.hooks;
@@ -161,9 +194,42 @@ var disconnectRemovals = (agent) => {
     }
   ];
 };
+var disconnectDirectories = (agent) => {
+  if (agent !== "cursor") return [];
+  return [{ path: cursorPluginDir(), manifest: cursorPluginManifest(), ownedBy: isPusharyCursorPluginManifest }];
+};
+var disconnectLeftoverDirectories = (agent, list) => {
+  if (agent !== "cursor") return [];
+  const parent = dirname(cursorPluginDir());
+  return list(parent).filter(isCursorPluginLeftover).map((name) => join(parent, name));
+};
+var disconnectInstructionFile = (agent) => {
+  switch (agent) {
+    case "codex":
+      return codexAgentsMd();
+    case "gemini":
+      return geminiMd();
+    case "opencode":
+      return openCodeInstructionsFile();
+    case "qwen":
+    case "codebuddy":
+    case "qoder":
+    case "droid":
+    case "devin": {
+      const profile = hookCompatibleProfileBySource(agent);
+      return profile ? compatibleInstructionsFile(profile) : null;
+    }
+    case "claude":
+    case "cursor":
+      return null;
+  }
+};
+var GATE_STILL_REGISTERED_NOTE = "kept because its gate could not be removed from the hooks file that points into it";
 var disconnectAgent = (agent, io) => {
   const changed = [];
   const untouched = [];
+  const unreadable = [];
+  const kept = [];
   const claudeReceiptPath = claudeMcpReceipt();
   const rawClaudeReceipt = agent === "claude" ? io.read(claudeReceiptPath) : null;
   let claudeReceipt = null;
@@ -196,6 +262,7 @@ var disconnectAgent = (agent, io) => {
       }
     } catch {
       untouched.push(edit.path);
+      unreadable.push(edit.path);
     }
   }
   for (const removal of disconnectRemovals(agent)) {
@@ -226,40 +293,105 @@ var disconnectAgent = (agent, io) => {
       untouched.push(claudeReceiptPath);
     }
   }
-  return { agent, changed, untouched };
+  const removeDirectory = io.removeDirectory;
+  if (removeDirectory) {
+    const owned = disconnectDirectories(agent).filter((directory) => {
+      const manifest = io.read(directory.manifest);
+      return manifest !== null && directory.ownedBy(manifest);
+    });
+    const targets = [...owned.map((directory) => directory.path), ...disconnectLeftoverDirectories(agent, io.list ?? (() => []))];
+    for (const path of targets) {
+      if (unreadable.length > 0) {
+        kept.push(`${path} (${GATE_STILL_REGISTERED_NOTE})`);
+        continue;
+      }
+      try {
+        removeDirectory(path);
+        changed.push(path);
+      } catch {
+        untouched.push(path);
+      }
+    }
+  }
+  const instructions = disconnectInstructionFile(agent);
+  if (instructions && io.removeInstructionBlock?.(instructions)) changed.push(instructions);
+  return { agent, changed, untouched, kept };
+};
+var disconnectFx = (io) => {
+  const changed = [];
+  const kept = [];
+  for (const action of planFxRemoval(fxMcpProfile(), fxSettings(), fxQuestionRuleReceipt())) {
+    if (action.kind === "write") {
+      io.write(action.path, action.text);
+      changed.push(action.path);
+    } else if (action.kind === "remove-receipt") {
+      io.remove(action.path);
+      changed.push(action.path);
+    } else if (action.kind === "kept") {
+      kept.push(`${action.label}: ${action.detail}`);
+    }
+  }
+  if (io.removeInstructionBlock(fxAgentsMd())) changed.push(fxAgentsMd());
+  return { changed, kept };
 };
 
 // bin/pushary-disconnect.ts
 exitOnHelpFlag("disconnect");
+var MAC_APP_LEAVES_IT_OFF = (agent) => `The Pushary Mac app will leave ${agent} off until you connect it again, from the app or with pushary setup.`;
+var MAC_APP_MAY_RESTORE_IT = (agent, file) => `Could not write ${file}, so a running Pushary Mac app may connect ${agent} again. Turn it off in the app's Settings too.`;
 var rest = process.argv.slice(2);
-var requested = rest[0] === "disconnect" ? rest[1] : rest[0];
-if (!requested || !isDisconnectableAgent(requested)) {
-  console.error(`Usage: pushary disconnect <${DISCONNECTABLE_AGENTS.join("|")}>`);
-  process.exit(1);
+var typed = rest[0] !== void 0 && isInvocationOf(rest[0], "disconnect") ? rest[1] : rest[0];
+var requested = typed === void 0 ? null : normalizeAgentId(typed, DISCONNECT_AGENT_IDS);
+var printResult = (agent, changed, kept) => {
+  if (changed.length === 0) console.log(`${agent} was not connected.`);
+  else {
+    console.log(`Disconnected ${agent}:`);
+    for (const path of changed) console.log(`  ${path}`);
+  }
+  if (kept.length > 0) {
+    console.log("Left as it is:");
+    for (const line of kept) console.log(`  ${line}`);
+  }
+};
+if (requested === null) {
+  if (typed !== void 0) console.error(`Unknown agent: ${typed}`);
+  console.error(`Usage: pushary disconnect <${DISCONNECT_AGENT_IDS.join("|")}>`);
+  console.error("Setup ids such as claude_code and gemini_cli work too.");
+  process.exit(EXIT.FAILED);
 }
-var result = disconnectAgent(requested, {
-  read: (path) => {
-    try {
-      return readFileSync(path, "utf-8");
-    } catch {
-      return null;
-    }
-  },
-  write: (path, contents) => writeFileSync(path, contents, "utf-8"),
-  parseToml: (raw) => parseTOML(raw),
-  stringifyToml: (config) => stringifyTOML(config),
-  remove: (path) => rmSync(path, { force: true }),
-  list: (dir) => {
-    try {
-      return readdirSync(dir);
-    } catch {
-      return [];
-    }
+if (isDisconnectableAgent(requested)) {
+  const decline = recordDeclinedAgent(requested);
+  const result = disconnectAgent(requested, {
+    read: (path) => {
+      try {
+        return readFileSync(path, "utf-8");
+      } catch {
+        return null;
+      }
+    },
+    write: (path, contents) => writeFileSync(path, contents, "utf-8"),
+    parseToml: (raw) => parseTOML(raw),
+    stringifyToml: (config) => stringifyTOML(config),
+    remove: (path) => rmSync(path, { force: true }),
+    list: (dir) => {
+      try {
+        return readdirSync(dir);
+      } catch {
+        return [];
+      }
+    },
+    removeDirectory: (path) => rmSync(path, { recursive: true, force: true }),
+    removeInstructionBlock
+  });
+  printResult(requested, result.changed, result.kept);
+  if (decline !== "unchanged" && macAppBridgeAvailable()) {
+    console.log(decline === "changed" ? MAC_APP_LEAVES_IT_OFF(requested) : MAC_APP_MAY_RESTORE_IT(requested, declinedAgentsFile()));
   }
-});
-if (result.changed.length === 0) {
-  console.log(`${requested} was not connected.`);
 } else {
-  console.log(`Disconnected ${requested}:`);
-  for (const path of result.changed) console.log(`  ${path}`);
+  const result = disconnectFx({
+    write: (path, contents) => writeFileSync(path, contents, "utf-8"),
+    remove: (path) => rmSync(path, { force: true }),
+    removeInstructionBlock
+  });
+  printResult(requested, result.changed, result.kept);
 }

package/dist/bin/pushary-doctor.js

@@ -3,64 +3,53 @@ import {
   describeWaitLadder
 } from "../chunk-CVWG2N3Y.js";
 import {
+  CURSOR_GATE_SCRIPT,
   readServiceExecPath,
   versionManagerOf
-} from "../chunk-GU3EJCVV.js";
+} from "../chunk-EA5NWDK7.js";
 import {
   CODEX_HOOK_REMEDY
-} from "../chunk-JWKBDSPF.js";
+} from "../chunk-DP3WX7FW.js";
 import {
   writeStdoutFully
 } from "../chunk-EO23EUOK.js";
 import {
   assessCodexHookTrust,
   readCodexTrustForPusharyHooks
-} from "../chunk-H7MMU64M.js";
+} from "../chunk-NGKUXZID.js";
 import {
   readMachineReadiness,
   readManagedControlEvidence
-} from "../chunk-MBK7N46B.js";
+} from "../chunk-QIOIO7VN.js";
 import {
-  FX_PROFILE_REFUSALS,
-  FX_PUSHARY_TOOLS_RULE,
-  FX_QUESTION_TOOL,
   HERMES_PIP_PACKAGE,
   HERMES_PLUGIN_NAME,
   agentProbes,
   detectAgent,
   detectAllAgents,
-  hasInstructionBlock,
   hermesWiredByPushary,
-  inspectFxInstallation,
   isDetected,
   isPluginRegistered,
   readHermesStatus,
   resolveHermesPython,
-  retryAgentCommand,
   shortenHome,
   vscodeSettingsTargets
-} from "../chunk-QQ4HBXZC.js";
-import "../chunk-W2KI5KPD.js";
-import {
-  compatibleConfigFile,
-  compatibleInstructionsFile,
-  compatibleMcpFile,
-  hasCompatibleHooks,
-  missingCompatibleHookEvents
-} from "../chunk-MZPXVH4A.js";
+} from "../chunk-UAP5DS6P.js";
 import {
-  OPENCODE_PLUGIN_PLACEHOLDER,
-  openCodePluginDir,
-  openCodePluginFile,
-  openCodeWired
-} from "../chunk-X5NXPCIC.js";
-import "../chunk-ANEAA37E.js";
+  FX_PROFILE_REFUSALS,
+  FX_PUSHARY_TOOLS_RULE,
+  FX_QUESTION_TOOL,
+  hasInstructionBlock,
+  inspectFxInstallation,
+  retryAgentCommand
+} from "../chunk-6W5M3MSE.js";
+import "../chunk-H5T27W7M.js";
 import {
   detectProviderLiveCapabilities,
   expectedLaunchCapabilities,
   hasSpawnProvider,
   resolveControlPolicy
-} from "../chunk-T7Y5EADL.js";
+} from "../chunk-F7R3SZ4Q.js";
 import "../chunk-RIVNNBEK.js";
 import {
   AUTO_UPDATE_DISABLE_ENV,
@@ -69,33 +58,10 @@ import {
   describeAutoUpdateCheck,
   readAutoUpdateState,
   takeAutoUpdateAnnouncement
-} from "../chunk-QTO6HEZD.js";
+} from "../chunk-K545B734.js";
 import {
   readLedgerSummary
-} from "../chunk-CBQACHKY.js";
-import {
-  describeBridgeResolution,
-  isBridgeLocator,
-  liveBridgeProbe,
-  resolveBridgeStub
-} from "../chunk-MNWRUGMH.js";
-import {
-  claudeOtherHolders,
-  claudeUnprovenHolds,
-  claudeWired,
-  codexOtherHolders,
-  codexUnprovenHolds,
-  codexWired,
-  cursorMcpAuthorization,
-  cursorOtherHolders,
-  cursorWired,
-  describeHoldSentence,
-  describeOtherHolder,
-  geminiOtherHolders,
-  geminiWired,
-  holdsLong,
-  pusharyHookExecutable
-} from "../chunk-4YO4T5FV.js";
+} from "../chunk-IIVZZMSO.js";
 import {
   daemonHasRemoteProof,
   daemonServiceManagerAvailable,
@@ -104,20 +70,8 @@ import {
   readDaemonNeedsLogin,
   readDaemonStatus,
   readInstalledDaemonService
-} from "../chunk-VXRXFU6Q.js";
-import {
-  GEMINI_HOOK_BINARY,
-  hasGeminiHooks,
-  missingGeminiHookEvents
-} from "../chunk-JCWZ23MJ.js";
+} from "../chunk-SZ4Q6ZVS.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-6ICPEJY5.js";
-import "../chunk-QFEM7R6T.js";
-import "../chunk-N6IOSZOE.js";
-import "../chunk-6DJTDHBI.js";
-import "../chunk-D6S5EKXA.js";
-import "../chunk-AVNKVF7N.js";
-import "../chunk-POFBE6ZY.js";
 import {
   describeReach,
   describeRoundTrip,
@@ -125,42 +79,100 @@ import {
   reachVerdict,
   roundTripEvidence,
   verifyRoundTrip
-} from "../chunk-N4EUSDKX.js";
+} from "../chunk-DCCSULXK.js";
 import "../chunk-3EGEA4KH.js";
 import "../chunk-QCGNGEGE.js";
+import {
+  SIGNED_OUT_ON_MAC_MESSAGE,
+  activeKeyVerdictOf,
+  describeSignedOutKey,
+  readSignedOutDiagnosis
+} from "../chunk-Q6C6ILUS.js";
+import {
+  CONNECTED_THROUGH_MAC_APP,
+  readMacAppConnectionWhenKeyless
+} from "../chunk-E5HOHIUV.js";
+import {
+  OPENCODE_PLUGIN_PLACEHOLDER,
+  openCodePluginDir,
+  openCodePluginFile,
+  openCodeWired
+} from "../chunk-BZLHTMT6.js";
+import {
+  compatibleConfigFile,
+  compatibleInstructionsFile,
+  compatibleMcpFile,
+  hasCompatibleHooks,
+  missingCompatibleHookEvents
+} from "../chunk-UF6RBP5V.js";
 import {
   createIo
 } from "../chunk-U4TMAANR.js";
 import {
   exitOnHelpFlag
-} from "../chunk-UFVGSEWH.js";
+} from "../chunk-TO3PS646.js";
+import {
+  claudeOtherHolders,
+  claudeUnprovenHolds,
+  claudeWired,
+  codexOtherHolders,
+  codexUnprovenHolds,
+  codexWired,
+  cursorMcpAuthorization,
+  cursorOtherHolders,
+  cursorWired,
+  describeBridgeResolution,
+  describeHoldSentence,
+  describeOtherHolder,
+  geminiOtherHolders,
+  geminiWired,
+  holdsLong,
+  isBridgeLocator,
+  liveBridgeProbe,
+  pusharyHookExecutable,
+  resolveBridgeStub
+} from "../chunk-BYLKCZ2G.js";
+import {
+  GEMINI_HOOK_BINARY,
+  hasGeminiHooks,
+  missingGeminiHookEvents
+} from "../chunk-M3STIAGU.js";
+import "../chunk-ZGADIZDS.js";
+import "../chunk-MLGIVVSG.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
+import "../chunk-6ICPEJY5.js";
 import {
   keyPrefix,
   readControlMode,
   readKeySource
-} from "../chunk-ADSQDYYG.js";
+} from "../chunk-REU2VQPH.js";
+import "../chunk-KQFTBQ66.js";
+import "../chunk-N6IOSZOE.js";
+import "../chunk-MD4SVNT6.js";
+import "../chunk-WRPYCIV2.js";
 import {
   callMcpTool,
   sendMcpRequest
-} from "../chunk-L76HTPU6.js";
+} from "../chunk-6AYSKVLL.js";
 import {
   checkApiKey,
   describeKeyCheck
-} from "../chunk-KFKL3FHS.js";
-import "../chunk-JXISQ7DT.js";
+} from "../chunk-QRXPWW3M.js";
+import "../chunk-UPIZSCYD.js";
+import "../chunk-POFBE6ZY.js";
+import "../chunk-5N5L6DNN.js";
 import {
   getMachineId
-} from "../chunk-KYO45G5L.js";
+} from "../chunk-KOWFRUIT.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-4D2AYNSE.js";
+import "../chunk-BNSKVIAW.js";
 import {
   CODEX_HOOK_EVENTS,
   CODEX_REQUIRED_APPROVAL_EVENTS,
@@ -191,14 +203,14 @@ import {
   readGlobalCliInstall,
   resolvePathBinary,
   vscodePluginDir
-} from "../chunk-ZUTU43FT.js";
+} from "../chunk-Z23ZBYDW.js";
 import "../chunk-T7E75EKA.js";
 import {
   getBaseUrl
-} from "../chunk-Z6HPS67T.js";
+} from "../chunk-IRHABAQT.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-STQRUH3S.js";
+} from "../chunk-5DCDQ5VW.js";
 import {
   AGENTS,
   CURSOR_GATE_EVENTS,
@@ -214,7 +226,7 @@ import {
   hookCompatibleProfile,
   isHookActivationReport,
   isNewerVersion
-} from "../chunk-QR6VE5ME.js";
+} from "../chunk-5RGA636G.js";
 
 // bin/pushary-doctor.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
@@ -405,9 +417,6 @@ function inertRegistrations(configs, resolves) {
 var describeInertRegistration = ({ named }) => `hooks here are registered for "${named}", which this CLI has no profile for, so every one of them stands aside`;
 var inertRegistrationRemedy = () => `Upgrade with ${NPX_LATEST_COMMAND} upgrade, or re-run setup to rewrite them for an agent this version knows`;
 
-// src/hooks-spec.ts
-var CURSOR_GATE_SCRIPT = "pushary-gate.mjs";
-
 // src/diagnostics/activation.ts
 import { realpathSync } from "fs";
 import { basename, dirname, join, resolve } from "path";
@@ -671,6 +680,7 @@ var main = async () => {
     }
   }
   const maskKey = (k) => `pk_${k.split(".")[0]?.slice(3, 7)}...`;
+  const macApp = readMacAppConnectionWhenKeyless(apiKey);
   if (keySource === "config-file") {
     console.log(`  ${pass} API key in ${dim(source.origin ?? "the config file")} ${dim(`(${maskKey(apiKey)})`)}`);
   } else if (keySource === "profile") {
@@ -680,6 +690,8 @@ var main = async () => {
       `found only in a shell profile (${maskKey(apiKey)}), which hooks do not read \u2014 re-run setup, or open a new terminal`
     );
     console.log(`    ${dim("Hooks read $PUSHARY_API_KEY, then")} ${dim(pusharyConfigFile())}`);
+  } else if (macApp.kind === "connected") {
+    check(true, CONNECTED_THROUGH_MAC_APP, `${macApp.keyPrefix}, held by the app; the CLI has no key of its own`);
   } else {
     check(!!apiKey, "API key in environment", apiKey ? maskKey(apiKey) : "PUSHARY_API_KEY not set");
   }
@@ -691,8 +703,12 @@ var main = async () => {
     );
   }
   let keyVerdict = null;
-  if (apiKey) {
-    keyVerdict = await checkApiKey(apiKey);
+  if (apiKey) keyVerdict = await checkApiKey(apiKey);
+  const signedOut = readSignedOutDiagnosis(apiKey ?? null, activeKeyVerdictOf(keyVerdict));
+  if (signedOut.kind === "signed_out_on_mac") {
+    check(false, "Key still signed in", SIGNED_OUT_ON_MAC_MESSAGE);
+    for (const line of describeSignedOutKey(signedOut)) console.log(`    ${dim(line)}`);
+  } else if (keyVerdict) {
     switch (keyVerdict.kind) {
       case "ok":
         check(
@@ -1289,9 +1305,13 @@ var main = async () => {
   console.log();
   console.log(`  ${dim("Connectivity")}`);
   if (!apiKey) {
-    check(false, "MCP server reachable", "skipped \u2014 no API key");
-    check(false, "API key valid", "skipped");
-    check(false, "MCP handshake", "skipped");
+    if (macApp.kind === "connected") {
+      console.log(`  ${dim("\u2013")} MCP server, key and handshake ${dim("(the Pushary Mac app holds this computer's key and checks its own connection)")}`);
+    } else {
+      check(false, "MCP server reachable", "skipped \u2014 no API key");
+      check(false, "API key valid", "skipped");
+      check(false, "MCP handshake", "skipped");
+    }
     const keylessSummary = readLedgerSummary(7);
     if (keylessSummary.count > 0) {
       check(false, "Keyless approval moments (7d)", `${keylessSummary.count} counted locally. See them with ${NPX_LATEST_COMMAND} stats`);
@@ -1348,7 +1368,7 @@ var main = async () => {
       check(
         verdict.kind === "yours",
         "Phone reachable",
-        verdict.kind === "yours" ? describeReach(channels) : verdict.kind === "nobody" ? "nothing connected, run pushary connect or get the app at https://pushary.com/download" : `${describeReach(channels)}; run pushary connect to add your own`,
+        verdict.kind === "yours" ? describeReach(channels) : verdict.kind === "nobody" ? "no phone paired, run pushary pair or get the app at https://pushary.com/download" : `${describeReach(channels)}; run pushary pair to pair your own`,
         "reachability"
       );
     }