@pushary/agent-hooks 1.7.2 → 1.8.0

package/dist/bin/pushary-connect.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 import {
   printKeyCheck
-} from "../chunk-OXEF6JHD.js";
+} from "../chunk-EX3GAPA4.js";
 import {
   connectDevice,
   connectExistingApp,
   printConnectInstructions
-} from "../chunk-YLCSKVQQ.js";
+} from "../chunk-M5JDZ45W.js";
 import "../chunk-3EGEA4KH.js";
 import "../chunk-QCGNGEGE.js";
 import {
@@ -14,31 +14,31 @@ import {
 } from "../chunk-U4TMAANR.js";
 import {
   exitOnHelpFlag
-} from "../chunk-6NHXKTQU.js";
+} from "../chunk-HZVVNGEW.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
 import {
   readKeySource
-} from "../chunk-VSGKQ3HI.js";
-import "../chunk-D4OGEWLH.js";
+} from "../chunk-P7WQEVWA.js";
+import "../chunk-M5ICYGHT.js";
 import {
   checkApiKey
-} from "../chunk-VQDJ6KB3.js";
-import "../chunk-UFNBKYWT.js";
-import "../chunk-HOIGXMI7.js";
+} from "../chunk-2ABTSGFT.js";
+import "../chunk-2OY3ZZ5N.js";
+import "../chunk-LXQ5FBBD.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-LI3C2IQY.js";
-import "../chunk-NYBZJ44G.js";
+import "../chunk-DB3ONZB4.js";
+import "../chunk-A2A2YTMG.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-SJN64NJX.js";
-import "../chunk-65RN6ZCO.js";
-import "../chunk-WWTLAZQA.js";
+import "../chunk-GPEGOGRJ.js";
+import "../chunk-E4FJTUH4.js";
+import "../chunk-NQTHFF4W.js";
 
 // bin/pushary-connect.ts
 exitOnHelpFlag("connect");

package/dist/bin/pushary-cowork.js

@@ -2,15 +2,15 @@
 import {
   coworkOutput,
   parseCoworkOptions
-} from "../chunk-3NSRL5E7.js";
+} from "../chunk-7Z7Q4GGS.js";
 import {
   canOpenBrowser,
   openInBrowser
 } from "../chunk-PUZZELE6.js";
-import "../chunk-I7B2DNVU.js";
+import "../chunk-ZVSKMPBZ.js";
 import {
   exitOnHelpFlag
-} from "../chunk-6NHXKTQU.js";
+} from "../chunk-HZVVNGEW.js";
 import "../chunk-GMXKITVA.js";
 import {
   UsageError
@@ -18,10 +18,10 @@ import {
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-65RN6ZCO.js";
+import "../chunk-E4FJTUH4.js";
 import {
   CLAUDE_CONNECTOR_GUIDE
-} from "../chunk-WWTLAZQA.js";
+} from "../chunk-NQTHFF4W.js";
 
 // bin/pushary-cowork.ts
 exitOnHelpFlag("cowork");

package/dist/bin/pushary-daemon.js

@@ -1,19 +1,19 @@
 #!/usr/bin/env node
 import {
   inspectConfiguredManagedProviders
-} from "../chunk-OJRB5QKN.js";
-import "../chunk-U3MS6D5X.js";
-import "../chunk-5GIBNUBD.js";
+} from "../chunk-VQKRG3AC.js";
+import "../chunk-SIFVFP6T.js";
+import "../chunk-RHR6NARM.js";
 import {
   HEARTBEAT_INTERVAL_MS,
   sendHeartbeat
-} from "../chunk-YU54LNC6.js";
-import "../chunk-KAJT6HPI.js";
+} from "../chunk-DE4Y6TCC.js";
+import "../chunk-AXPCESYO.js";
 import {
   detectProviderLiveCapabilities,
   hasSpawnProvider,
   resolveControlPolicy
-} from "../chunk-YNJ2H2FD.js";
+} from "../chunk-HQ6G3B5R.js";
 import {
   SESSION_REAP_SILENCE_MS,
   describeIdleWindow,
@@ -21,15 +21,15 @@ import {
   listProcessProofs,
   ownsLiveProcess,
   silentSpawnedProofs
-} from "../chunk-PWNQGITG.js";
+} from "../chunk-ZSZSSJCV.js";
 import {
   startRegisteredTranscripts
-} from "../chunk-ZMWX5SDA.js";
+} from "../chunk-JZTHGAPA.js";
 import "../chunk-SGZJ5LYH.js";
-import "../chunk-E3PLF7YB.js";
-import "../chunk-I7B2DNVU.js";
-import "../chunk-JMSB6CJT.js";
-import "../chunk-L6IF4JOF.js";
+import "../chunk-EYK3GSRH.js";
+import "../chunk-ZVSKMPBZ.js";
+import "../chunk-C2WCPBF7.js";
+import "../chunk-6J2JC2RT.js";
 import {
   DAEMON_LEASE_RENEW_INTERVAL_MS,
   acquireDaemonLease,
@@ -46,46 +46,46 @@ import {
   requestDaemonHandoff,
   stopDaemonRunning,
   writeDaemonNeedsLogin
-} from "../chunk-4S7CCOXB.js";
-import "../chunk-A6WQF7FQ.js";
-import "../chunk-KLXYMPTM.js";
-import "../chunk-R7ZETVNR.js";
-import "../chunk-QSZ37ROP.js";
-import "../chunk-Q7CDBJXU.js";
+} from "../chunk-WE2J62NC.js";
+import "../chunk-3EVPNIBE.js";
+import "../chunk-OKXS7WDZ.js";
+import "../chunk-MPWXGONV.js";
+import "../chunk-SAXBC4AZ.js";
+import "../chunk-OLQRRFBX.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
-import "../chunk-RLRDPZG4.js";
+import "../chunk-EPCXUP3P.js";
 import {
   writeHuman
 } from "../chunk-QCGNGEGE.js";
 import {
   exitOnHelpFlag
-} from "../chunk-6NHXKTQU.js";
+} from "../chunk-HZVVNGEW.js";
 import "../chunk-GMXKITVA.js";
 import {
   readControlMode
-} from "../chunk-VSGKQ3HI.js";
+} from "../chunk-P7WQEVWA.js";
 import {
   getMachineId
-} from "../chunk-HOIGXMI7.js";
+} from "../chunk-LXQ5FBBD.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-LI3C2IQY.js";
+import "../chunk-DB3ONZB4.js";
 import {
   resolveBinary
-} from "../chunk-NYBZJ44G.js";
+} from "../chunk-A2A2YTMG.js";
 import "../chunk-T7E75EKA.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-SJN64NJX.js";
+} from "../chunk-GPEGOGRJ.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-65RN6ZCO.js";
-import "../chunk-WWTLAZQA.js";
+} from "../chunk-E4FJTUH4.js";
+import "../chunk-NQTHFF4W.js";
 
 // src/spawn-daemon.ts
 import { execFileSync, spawn } from "child_process";

package/dist/bin/pushary-disconnect.js

@@ -8,40 +8,40 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-SKEW3TQX.js";
+} from "../chunk-AHV4LNB5.js";
 import {
   compatibleConfigFile,
   compatibleMcpFile,
   compatiblePermissionRuleFile,
   removeCompatibleHooks,
   removeCompatibleMcpServer
-} from "../chunk-T3PRPFDY.js";
+} from "../chunk-J5TIV3J6.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removePusharySettings,
   removePusharyToolPermissions,
   restoreClaudeMcpServer
-} from "../chunk-KAJT6HPI.js";
+} from "../chunk-AXPCESYO.js";
 import {
   removeGeminiSettings
-} from "../chunk-A6WQF7FQ.js";
-import "../chunk-2B4XCMH6.js";
+} from "../chunk-3EVPNIBE.js";
+import "../chunk-CULUZTWQ.js";
 import "../chunk-N6IOSZOE.js";
-import "../chunk-RLRDPZG4.js";
-import "../chunk-2XOHXZRC.js";
-import "../chunk-6QZK4O36.js";
+import "../chunk-EPCXUP3P.js";
+import "../chunk-NGDD6TXY.js";
+import "../chunk-CVQYGMSR.js";
 import "../chunk-POFBE6ZY.js";
 import {
   exitOnHelpFlag
-} from "../chunk-6NHXKTQU.js";
-import "../chunk-D4OGEWLH.js";
-import "../chunk-VQDJ6KB3.js";
-import "../chunk-UFNBKYWT.js";
-import "../chunk-HOIGXMI7.js";
+} from "../chunk-HZVVNGEW.js";
+import "../chunk-M5ICYGHT.js";
+import "../chunk-2ABTSGFT.js";
+import "../chunk-2OY3ZZ5N.js";
+import "../chunk-LXQ5FBBD.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-LI3C2IQY.js";
+import "../chunk-DB3ONZB4.js";
 import {
   claudeJson,
   claudeMcpReceipt,
@@ -55,14 +55,14 @@ import {
   geminiSettings,
   removeCodexHooks,
   removeCodexSettings
-} from "../chunk-NYBZJ44G.js";
+} from "../chunk-A2A2YTMG.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-SJN64NJX.js";
-import "../chunk-65RN6ZCO.js";
+import "../chunk-GPEGOGRJ.js";
+import "../chunk-E4FJTUH4.js";
 import {
   DISCONNECTABLE_AGENTS,
   hookCompatibleProfileBySource
-} from "../chunk-WWTLAZQA.js";
+} from "../chunk-NQTHFF4W.js";
 
 // bin/pushary-disconnect.ts
 import { readdirSync, readFileSync, rmSync, writeFileSync } from "fs";

package/dist/bin/pushary-doctor.js

@@ -4,65 +4,56 @@ import {
 } from "../chunk-CVWG2N3Y.js";
 import {
   readServiceExecPath,
-  retryAgentCommand,
   versionManagerOf
-} from "../chunk-INR3RVQ3.js";
+} from "../chunk-GU3EJCVV.js";
 import {
   assessCodexHookTrust,
   readCodexTrustForPusharyHooks
-} from "../chunk-5GIBNUBD.js";
+} from "../chunk-RHR6NARM.js";
 import {
   readMachineReadiness,
   readManagedControlEvidence
-} from "../chunk-YU54LNC6.js";
+} from "../chunk-DE4Y6TCC.js";
 import {
   FX_PROFILE_REFUSALS,
   FX_PUSHARY_TOOLS_RULE,
   FX_QUESTION_TOOL,
-  FX_SETTINGS_REFUSALS,
   HERMES_PIP_PACKAGE,
   HERMES_PLUGIN_NAME,
   agentProbes,
   detectAgent,
   detectAllAgents,
-  fxBridgeTargetOf,
-  fxPusharyEntryOf,
-  fxQuestionRouting,
   hasInstructionBlock,
   hermesWiredByPushary,
+  inspectFxInstallation,
   isDetected,
-  isFxPusharyEntry,
   isPluginRegistered,
-  pusharyToolsAllowed,
-  readFxFile,
-  readFxProfile,
-  readFxSettings,
   readHermesStatus,
   resolveHermesPython,
+  retryAgentCommand,
   shortenHome,
-  vscodeSettingsTargets,
-  workspacesShowingQuestionTool
-} from "../chunk-SKMWPXGV.js";
-import "../chunk-TVJYGZXB.js";
+  vscodeSettingsTargets
+} from "../chunk-MDEPU45E.js";
+import "../chunk-SLFABHW3.js";
 import {
   OPENCODE_PLUGIN_PLACEHOLDER,
   openCodePluginDir,
   openCodePluginFile,
   openCodeWired
-} from "../chunk-SKEW3TQX.js";
+} from "../chunk-AHV4LNB5.js";
 import {
   compatibleConfigFile,
   compatibleInstructionsFile,
   compatibleMcpFile,
   hasCompatibleHooks,
   missingCompatibleHookEvents
-} from "../chunk-T3PRPFDY.js";
-import "../chunk-KAJT6HPI.js";
+} from "../chunk-J5TIV3J6.js";
+import "../chunk-AXPCESYO.js";
 import {
   detectProviderLiveCapabilities,
   hasSpawnProvider,
   resolveControlPolicy
-} from "../chunk-YNJ2H2FD.js";
+} from "../chunk-HQ6G3B5R.js";
 import {
   AUTO_UPDATE_DISABLE_ENV,
   autoUpdateOffReason,
@@ -70,16 +61,16 @@ import {
   describeAutoUpdateCheck,
   readAutoUpdateState,
   takeAutoUpdateAnnouncement
-} from "../chunk-YU4222G2.js";
+} from "../chunk-UI36QSBI.js";
 import {
   readLedgerSummary
-} from "../chunk-F6BMJOSW.js";
+} from "../chunk-JU6W3XAU.js";
 import {
   describeBridgeResolution,
   isBridgeLocator,
   liveBridgeProbe,
   resolveBridgeStub
-} from "../chunk-JMSB6CJT.js";
+} from "../chunk-C2WCPBF7.js";
 import {
   claudeOtherHolders,
   claudeUnprovenHolds,
@@ -96,7 +87,7 @@ import {
   geminiWired,
   holdsLong,
   pusharyHookExecutable
-} from "../chunk-L6IF4JOF.js";
+} from "../chunk-6J2JC2RT.js";
 import {
   daemonHasRemoteProof,
   daemonServiceManagerAvailable,
@@ -105,18 +96,18 @@ import {
   readDaemonNeedsLogin,
   readDaemonStatus,
   readInstalledDaemonService
-} from "../chunk-4S7CCOXB.js";
+} from "../chunk-WE2J62NC.js";
 import {
   GEMINI_HOOK_BINARY,
   hasGeminiHooks,
   missingGeminiHookEvents
-} from "../chunk-A6WQF7FQ.js";
+} from "../chunk-3EVPNIBE.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-2B4XCMH6.js";
+import "../chunk-CULUZTWQ.js";
 import "../chunk-N6IOSZOE.js";
-import "../chunk-RLRDPZG4.js";
-import "../chunk-2XOHXZRC.js";
-import "../chunk-6QZK4O36.js";
+import "../chunk-EPCXUP3P.js";
+import "../chunk-NGDD6TXY.js";
+import "../chunk-CVQYGMSR.js";
 import "../chunk-POFBE6ZY.js";
 import {
   describeReach,
@@ -125,7 +116,7 @@ import {
   reachVerdict,
   roundTripEvidence,
   verifyRoundTrip
-} from "../chunk-YLCSKVQQ.js";
+} from "../chunk-M5JDZ45W.js";
 import "../chunk-3EGEA4KH.js";
 import "../chunk-QCGNGEGE.js";
 import {
@@ -133,7 +124,7 @@ import {
 } from "../chunk-U4TMAANR.js";
 import {
   exitOnHelpFlag
-} from "../chunk-6NHXKTQU.js";
+} from "../chunk-HZVVNGEW.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
@@ -141,26 +132,26 @@ import {
   keyPrefix,
   readControlMode,
   readKeySource
-} from "../chunk-VSGKQ3HI.js";
+} from "../chunk-P7WQEVWA.js";
 import {
   callMcpTool,
   sendMcpRequest
-} from "../chunk-D4OGEWLH.js";
+} from "../chunk-M5ICYGHT.js";
 import {
   checkApiKey,
   describeKeyCheck
-} from "../chunk-VQDJ6KB3.js";
-import "../chunk-UFNBKYWT.js";
+} from "../chunk-2ABTSGFT.js";
+import "../chunk-2OY3ZZ5N.js";
 import {
   getMachineId
-} from "../chunk-HOIGXMI7.js";
+} from "../chunk-LXQ5FBBD.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-LI3C2IQY.js";
+import "../chunk-DB3ONZB4.js";
 import {
   CODEX_HOOK_EVENTS,
   autoUpdateState,
@@ -176,7 +167,6 @@ import {
   cursorPluginDir,
   cursorUserHooks,
   cursorUserMcp,
-  execNpm,
   fetchLatestPublishedVersion,
   fxMcpProfile,
   fxSettings,
@@ -188,16 +178,17 @@ import {
   missingCodexHookEvents,
   pusharyConfigFile,
   readCodexMcpAuth,
+  readGlobalCliInstall,
   resolvePathBinary,
   vscodePluginDir
-} from "../chunk-NYBZJ44G.js";
+} from "../chunk-A2A2YTMG.js";
 import "../chunk-T7E75EKA.js";
 import {
   getBaseUrl
-} from "../chunk-SJN64NJX.js";
+} from "../chunk-GPEGOGRJ.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-65RN6ZCO.js";
+} from "../chunk-E4FJTUH4.js";
 import {
   AGENTS,
   CURSOR_GATE_EVENTS,
@@ -206,12 +197,13 @@ import {
   HOOK_SOURCES,
   SUPPORT_DISCORD,
   SUPPORT_EMAIL,
+  commandsPackage,
   getPackageVersion,
   hookActivationResult,
   hookCompatibleProfile,
   isHookActivationReport,
   isNewerVersion
-} from "../chunk-WWTLAZQA.js";
+} from "../chunk-NQTHFF4W.js";
 
 // bin/pushary-doctor.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
@@ -221,6 +213,33 @@ import { execFileSync } from "child_process";
 import { confirm } from "@inquirer/prompts";
 import { parse as parseTOML } from "smol-toml";
 
+// src/diagnostics/global-package.ts
+var NOT_FOUND = "not found";
+var NPM_PREFIX_UNREADABLE = "not found (npm could not report its global prefix)";
+var BOTH_INSTALLED_WARNING = "npm uninstall -g of either name removes every Pushary command";
+var describeInstalledPackage = (installed2) => installed2.version === void 0 ? `${installed2.name}, version unreadable` : `${installed2.name} ${installed2.version}`;
+var describeCommandOwner = (owner) => owner.kind === "owned" ? `the commands run from ${owner.name}` : "which one owns the commands could not be read";
+var globalPackageCheck = (install) => {
+  switch (install.kind) {
+    case "unavailable":
+      return { ok: false, detail: NPM_PREFIX_UNREADABLE, commands: void 0 };
+    case "absent":
+      return { ok: false, detail: NOT_FOUND, commands: void 0 };
+    case "single":
+      return {
+        ok: install.installed.version !== void 0,
+        detail: describeInstalledPackage(install.installed),
+        commands: install.installed
+      };
+    case "both":
+      return {
+        ok: false,
+        detail: `both installed: ${install.installed.map(describeInstalledPackage).join(" and ")}; ${describeCommandOwner(install.owner)}; ${BOTH_INSTALLED_WARNING}`,
+        commands: commandsPackage(install)
+      };
+  }
+};
+
 // src/diagnostics/auto-update.ts
 var globalPackageFreshness = (installed2, latest) => isNewerVersion(latest, installed2) ? { upToDate: false, detail: `${installed2} installed, ${latest} available \u2014 run ${NPX_LATEST_COMMAND} upgrade` } : { upToDate: true, detail: installed2 };
 var AUTO_UPDATE_ON = "on: once a day at session start, within the same major version";
@@ -254,22 +273,21 @@ var describeAutoUpdateStatus = (input) => {
 
 // src/diagnostics/bundle.ts
 import { homedir, hostname } from "os";
-var globalVersion = () => {
-  try {
-    return execNpm("list -g --no-workspaces @pushary/agent-hooks --depth=0", { timeout: 1e4 }).toString().match(/@pushary\/agent-hooks@([\d.]+)/)?.[1] ?? null;
-  } catch {
-    return null;
-  }
+var installedGlobalPackages = (install) => {
+  if (install.kind === "single") return [install.installed];
+  if (install.kind === "both") return install.installed;
+  return [];
 };
 var collectBundle = async (options2 = {}) => {
   const now = options2.now ?? (() => /* @__PURE__ */ new Date());
-  const readGlobalVersion = options2.readGlobalVersion ?? globalVersion;
+  const globalInstall = (options2.readGlobalInstall ?? readGlobalCliInstall)();
   const source = readKeySource();
   const identity = options2.identity ?? null;
   return {
     generatedAt: now().toISOString(),
     cliVersion: getPackageVersion(),
-    globalVersion: readGlobalVersion(),
+    globalVersion: commandsPackage(globalInstall)?.version ?? null,
+    globalPackages: installedGlobalPackages(globalInstall),
     node: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -483,12 +501,6 @@ var reportHermesStatus = (status) => {
   if (status.questionsRouted) check(true, "Hermes: questions go through Pushary", `clarify is off in ${config}`);
   else console.log(`  ${warn} Hermes: questions can stop in the terminal ${dim(`(clarify is not in agent.disabled_toolsets in ${config})`)}`);
 };
-var fxSettingsProblem = (read) => {
-  if (read.kind === "missing") return `${fxSettings()} is missing, so fx runs with no Pushary rules; re-run ${retryAgentCommand("fx")}`;
-  if (read.kind === "unreadable") return `${fxSettings()} could not be read`;
-  if (read.kind === "refused") return `${fxSettings()} ${FX_SETTINGS_REFUSALS[read.reason]}`;
-  return null;
-};
 var FX_QUESTION_ROUTING_WARNINGS = {
   "full-access": "full-access mode ignores permission rules, so fx's terminal question tool stays on; its instructions ask it to use Pushary instead",
   overridden: `a rule in ${fxSettings()} keeps ${FX_QUESTION_TOOL} on; make "${FX_QUESTION_TOOL}": "deny" the last rule that matches it`
@@ -1112,27 +1124,25 @@ var main = async () => {
   } else {
     skipped("OpenCode", installed("opencode") ? "installed, but Pushary is not set up for it" : "not installed");
   }
-  const fxProfile = readFxFile(fxMcpProfile(), readFxProfile);
-  const fxEntry = fxProfile.kind === "profile" ? fxPusharyEntryOf(fxProfile.profile) : void 0;
-  if (isFxPusharyEntry(fxEntry)) {
+  const fx = inspectFxInstallation(fxMcpProfile(), fxSettings(), process.env);
+  const fxProfile = fx.profile;
+  if (fx.configured) {
     checking("fx");
     check(true, "fx: Pushary MCP server configured", fxMcpProfile());
-    const bridge = fxBridgeTargetOf(fxEntry);
+    const bridge = fx.bridge;
     if (bridge) {
       const found = fxBridgeFound(bridge);
       check(found, "fx: bridge binary resolves", found ? bridge : `${bridge} is not installed or not on PATH \u2014 re-run ${retryAgentCommand("fx")}`);
     }
-    const fxSettingsRead = readFxFile(fxSettings(), readFxSettings);
-    const settingsProblem = fxSettingsProblem(fxSettingsRead);
-    const fxSettings2 = fxSettingsRead.kind === "settings" ? fxSettingsRead.settings : {};
+    const settingsProblem = fx.settingsProblem;
     if (settingsProblem) {
       console.log(`  ${warn} fx: Pushary tools are not auto-allowed and questions can still stop in the terminal ${dim(`(${settingsProblem})`)}`);
-    } else if (!pusharyToolsAllowed(fxSettings2)) {
+    } else if (!fx.toolsAllowed) {
       console.log(`  ${warn} fx: Pushary tools are not auto-allowed ${dim(`(fx will review or prompt for each call; add "${FX_PUSHARY_TOOLS_RULE}": "allow" to permission in ${fxSettings()})`)}`);
     }
-    const questionRouting = fxQuestionRouting(fxSettings2, process.env);
+    const questionRouting = fx.questionRouting;
     if (settingsProblem === null) reportFxQuestionRouting(questionRouting);
-    const workspacesShowingQuestions = workspacesShowingQuestionTool(fxSettings2);
+    const workspacesShowingQuestions = fx.workspacesShowingQuestions;
     if (workspacesShowingQuestions.length > 0) {
       console.log(`  ${warn} fx: ${workspacesShowingQuestions.length} workspace(s) replace the global rules and keep ${FX_QUESTION_TOOL} on ${dim(`(add "${FX_QUESTION_TOOL}": "deny" to their permission rules in ${fxSettings()})`)}`);
     }
@@ -1164,17 +1174,13 @@ var main = async () => {
   if (claudeInPlay) {
     check(existsSync(SKILL_PATH), "Skill installed", existsSync(SKILL_PATH) ? SKILL_PATH : "not found");
   }
-  let globalVersion2 = "";
-  try {
-    globalVersion2 = execNpm("list -g --no-workspaces @pushary/agent-hooks --depth=0", { timeout: 1e4 }).toString().match(/@pushary\/agent-hooks@([\d.]+)/)?.[1] ?? "";
-  } catch {
-    globalVersion2 = "";
-  }
-  check(!!globalVersion2, "Global package installed", globalVersion2 || "not found");
-  if (globalVersion2) {
-    const latest = await fetchLatestPublishedVersion();
+  const globalPackage = globalPackageCheck(readGlobalCliInstall());
+  const globalVersion = globalPackage.commands?.version ?? "";
+  check(globalPackage.ok, "Global package installed", globalPackage.detail);
+  if (globalPackage.commands && globalVersion) {
+    const latest = await fetchLatestPublishedVersion({ packageName: globalPackage.commands.name });
     if (latest) {
-      const freshness = globalPackageFreshness(globalVersion2, latest);
+      const freshness = globalPackageFreshness(globalVersion, latest);
       check(freshness.upToDate, "Global package up to date", freshness.detail);
     }
   }
@@ -1194,7 +1200,7 @@ var main = async () => {
     }
   });
   if (aliasRc) {
-    if (globalVersion2) {
+    if (globalVersion) {
       check(true, "claude alias \u2192 pushary claude", `set in ${aliasRc.split("/").pop()}`);
     } else {
       check(false, "claude alias \u2192 pushary claude", "alias is set but pushary is not installed \u2014 run `unalias claude` (this shell) or reinstall");