@pushary/agent-hooks 1.9.50 → 1.9.52

package/dist/bin/pushary-setup.js

@@ -1,27 +1,27 @@
 #!/usr/bin/env node
 import {
   runBrowserLogin
-} from "../chunk-YTYXFA5M.js";
+} from "../chunk-FI73DGNB.js";
 import {
   coworkOutput,
   coworkSelection
-} from "../chunk-PXUNPXOX.js";
+} from "../chunk-ZOP3I2GQ.js";
 import "../chunk-PUZZELE6.js";
 import {
   clearDeclinedAgent,
   declinedAgentForSetupChoice
-} from "../chunk-WLT6J3SB.js";
+} from "../chunk-ALZZVC3E.js";
 import {
   CURSOR_GATE_SCRIPT,
   describeVersionManagerPin,
   saveSetupFailure,
   versionManagerOf
-} from "../chunk-OZLGTMIY.js";
+} from "../chunk-XSUJ2PQY.js";
 import {
   codexTrustOutcome,
   describeCodexTrustConfirmation,
   needsCodexTrustStep
-} from "../chunk-HXRH7ZCK.js";
+} from "../chunk-NHVEQLQC.js";
 import {
   describeWaitLadder
 } from "../chunk-CVWG2N3Y.js";
@@ -39,23 +39,24 @@ import {
   roundTripEvidence,
   verifyRoundTrip,
   waitForYourPhone
-} from "../chunk-UHVD7BSV.js";
+} from "../chunk-XZRLFBEA.js";
 import "../chunk-3EGEA4KH.js";
 import {
   readManagedControlEvidence,
   waitForMachineReadiness
-} from "../chunk-GTGXQ7FJ.js";
+} from "../chunk-XDCXTDHH.js";
 import {
   ensureCodexTrustsPusharyHooks
-} from "../chunk-KIO2MZQC.js";
-import {
-  setHumanStream
-} from "../chunk-QCGNGEGE.js";
+} from "../chunk-FCMWUYIE.js";
 import {
   describeSetupSideEffects,
   installAgentSkill,
   installSkillViaSkillsCli
 } from "../chunk-EUW7JL2K.js";
+import {
+  codexEngineBehindLauncher
+} from "../chunk-DMJFW4KL.js";
+import "../chunk-XCEN33UP.js";
 import {
   CURSOR_PLUGIN_BACKUP_INFIX,
   CURSOR_PLUGIN_STAGING_PREFIX,
@@ -64,7 +65,7 @@ import {
   soleGateFile,
   soleGateReceipt,
   soleGateReceiptFile
-} from "../chunk-34AQAQKW.js";
+} from "../chunk-63IQRYVP.js";
 import {
   HERMES_PIP_PACKAGE,
   describeDetection,
@@ -77,15 +78,21 @@ import {
   runHermesConfigScript,
   shortenHome,
   vscodeSettingsTargets
-} from "../chunk-VCZN7NAB.js";
+} from "../chunk-EPOD7QHT.js";
 import {
   mcpServerBearer,
   readMacAppAgentKey
-} from "../chunk-K73CBZKW.js";
+} from "../chunk-MHQB62K5.js";
+import {
+  setHumanStream
+} from "../chunk-QCGNGEGE.js";
 import {
   AgentConfigError,
+  CODEX_INSTRUCTIONS_LABEL,
   FX_PUSHARY_TOOLS_RULE,
   FX_QUESTION_TOOL,
+  GEMINI_INSTRUCTIONS_LABEL,
+  OPENCODE_INSTRUCTIONS_LABEL,
   SHARED_AGENTS_MD_LABEL,
   afterAgentFailureNote,
   agentFailureFromError,
@@ -109,10 +116,10 @@ import {
   writeInstructionBlock,
   writeSetupConfigFile,
   writeSetupConfigJson
-} from "../chunk-DH4BWFU7.js";
+} from "../chunk-MTKV4RUQ.js";
 import {
   MCP_BRIDGE_BINARY
-} from "../chunk-GDDXGBTM.js";
+} from "../chunk-46TC24ET.js";
 import {
   OPENCODE_HOOK_BINARY,
   addOpenCodeMcpServer,
@@ -128,16 +135,29 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   openCodeWired
-} from "../chunk-LLRYP5TR.js";
+} from "../chunk-K23WMLPY.js";
 import {
   ansiPainter,
   createIo,
   useColor
 } from "../chunk-FO3MDD26.js";
+import {
+  checkCodexInstall,
+  detectProviderLiveCapabilities,
+  expectedLaunchCapabilities,
+  hasSpawnProvider,
+  missingControlPrerequisite,
+  nodeCodexInstallProbe,
+  phoneStartIsRequired,
+  resolveControlPolicy
+} from "../chunk-2LEH5IGX.js";
+import {
+  detectClaudeVersion
+} from "../chunk-RIVNNBEK.js";
 import {
   describeAutoUpdateAnnouncement,
   takeAutoUpdateAnnouncement
-} from "../chunk-APASKZ2I.js";
+} from "../chunk-QKU46TK5.js";
 import {
   addClaudeMcpServer,
   addCompatibleHooks,
@@ -152,11 +172,12 @@ import {
   compatibleInstructionsFile,
   compatibleMcpFile,
   compatiblePermissionRuleFile,
+  compatibleRecord,
   compatibleTargetPaths,
   hasCompatibleHooks,
   isClaudeMcpSnapshot,
   updateClaudeMcpSnapshot
-} from "../chunk-Y74IJ2IO.js";
+} from "../chunk-N77BH7H2.js";
 import {
   DAEMON_COLD_START_TIMEOUT_MS,
   clearDaemonNeedsLogin,
@@ -170,7 +191,7 @@ import {
   replaceDaemonService,
   stopDaemonService,
   waitForDaemonRemoteProof
-} from "../chunk-ZMYLVFXC.js";
+} from "../chunk-BL3WAGIK.js";
 import {
   KEEP_HINT,
   captureHookTakeover,
@@ -182,24 +203,29 @@ import {
   geminiWired,
   planHooks,
   pusharyHookExecutable
-} from "../chunk-WEY5ZHDB.js";
+} from "../chunk-Q7OXI6VS.js";
 import {
   GEMINI_HOOK_BINARY,
   GEMINI_HOOK_EVENTS,
   addGeminiHooks,
   addGeminiMcpServer
-} from "../chunk-25SYEAW4.js";
+} from "../chunk-6C4S3QYD.js";
 import {
   AGENT_CHOICES,
   effectiveControlMode,
   effectiveVerify,
   parseSetupOptions
-} from "../chunk-PA54A437.js";
-import "../chunk-XTVEW2NG.js";
+} from "../chunk-BUXDR6US.js";
+import "../chunk-LIESRXK5.js";
 import "../chunk-GMXKITVA.js";
 import {
   transcriptPreferenceForSetup
-} from "../chunk-JGNYCRB2.js";
+} from "../chunk-FV34HT35.js";
+import "../chunk-XHKBHWLX.js";
+import {
+  compareVersion,
+  parseVersion
+} from "../chunk-6ICPEJY5.js";
 import {
   KEY_FILE_MODE,
   exportLine,
@@ -212,48 +238,36 @@ import {
   recordMacAppKeyPrefix,
   resolveShellRc,
   writeKey
-} from "../chunk-XH3F66VD.js";
+} from "../chunk-VYBH6D4X.js";
 import {
-  checkCodexInstall,
-  detectProviderLiveCapabilities,
-  expectedLaunchCapabilities,
-  hasSpawnProvider,
-  missingControlPrerequisite,
-  nodeCodexInstallProbe,
-  phoneStartIsRequired,
-  resolveControlPolicy
-} from "../chunk-GBKSCDEK.js";
-import {
-  detectClaudeVersion
-} from "../chunk-RIVNNBEK.js";
-import "../chunk-XHKBHWLX.js";
-import {
-  compareVersion,
-  parseVersion
-} from "../chunk-6ICPEJY5.js";
+  CODEX_ENGINE_DIRECTORY,
+  CODEX_ENGINE_ENTRYPOINT,
+  CODEX_ENGINE_MANIFEST,
+  codexEngineInside
+} from "../chunk-36NGFHE4.js";
 import {
   reportEvent
-} from "../chunk-YVO4HIHX.js";
-import "../chunk-B7LV6W7U.js";
-import "../chunk-KEAIIVW3.js";
-import "../chunk-AWMMABVB.js";
+} from "../chunk-U2L42GVI.js";
+import "../chunk-3RPN7AAT.js";
+import "../chunk-JBT3ZSJS.js";
+import "../chunk-ZMPR436Z.js";
+import "../chunk-P2546BBI.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-LZYJMSOY.js";
 import {
   checkApiKey,
   describeKeyCheck,
   samePusharyAccount
-} from "../chunk-34RXPM5U.js";
-import "../chunk-ABMEBN2R.js";
-import "../chunk-LY3OJFBW.js";
+} from "../chunk-L5YTS2BP.js";
+import "../chunk-EK7SZJ4K.js";
+import "../chunk-T6RIKJUO.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
+import "../chunk-4QQEUJL4.js";
 import {
-  NpmMissingError,
   addCodexHookTrust,
   addCodexHooks,
   addCodexMcpServer,
@@ -267,13 +281,13 @@ import {
   codexConfigToml,
   codexHome,
   codexHookPositions,
+  codexHooksJson,
   codexSkillDir2 as codexSkillDir,
   codexVacatedIndexes,
   cursorPluginDir,
   cursorUserHooks,
   cursorUserMcp,
   dropVacatedCodexHookTrust,
-  fetchLatestPublishedVersion,
   fxAgentsMd,
   fxConfigDir,
   fxMcpProfile,
@@ -287,47 +301,53 @@ import {
   guardedArgv,
   hermesConfigReceipt,
   hookTakeoverReceipt,
-  installGlobally,
-  npmInstallFailure,
-  plannedGlobalPackage,
   pusharyConfigFile,
   readCodexMcpAuth,
-  resolveGlobalBinDir,
-  resolveGlobalBinary,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-ZYYQJSIO.js";
+} from "../chunk-OML4YFBN.js";
+import {
+  NpmMissingError,
+  fetchLatestPublishedVersion,
+  installGlobally,
+  npmInstallFailure,
+  plannedGlobalPackage,
+  resolveGlobalBinDir,
+  resolveGlobalBinary
+} from "../chunk-XUW2DRAQ.js";
 import {
   backupFile,
   readJsonSafe
 } from "../chunk-AQFEP65J.js";
 import {
   getBaseUrl
-} from "../chunk-VUS6QGND.js";
+} from "../chunk-CQ5JGRML.js";
 import {
   NPX_LATEST_COMMAND,
   renderCommandHelp
-} from "../chunk-ZOKMGBPR.js";
+} from "../chunk-MC4VY5LK.js";
+import {
+  getPackageVersion,
+  isNewerVersion,
+  launchedPackage,
+  ownPackageName
+} from "../chunk-QTOLNRET.js";
 import {
   HOOK_COMPATIBLE_PROFILES,
   PRETOOLUSE_GATED_TOOLS,
   SUPPORT_EMAIL,
   computerOsOfPlatform,
-  getPackageVersion,
   hookCompatibleProfile,
   isApprovalMode,
   isComputerAgent,
-  isNewerVersion,
   isRecord,
   isTimeoutAction,
-  isValidApiKey,
-  launchedPackage,
-  ownPackageName
-} from "../chunk-OR5F63C2.js";
+  isValidApiKey
+} from "../chunk-LF3TLC7B.js";
 
 // bin/pushary-setup.ts
 import { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync, rmSync, renameSync, realpathSync, statSync, openSync, readSync, closeSync } from "fs";
-import { join as join3, dirname as dirname2, basename } from "path";
+import { join as join4, dirname as dirname3, basename } from "path";
 import { homedir, hostname } from "os";
 import { execSync } from "child_process";
 import { checkbox, input, confirm } from "@inquirer/prompts";
@@ -337,6 +357,26 @@ import { parse as parseTOML, stringify as stringifyTOML } from "smol-toml";
 // src/cli/exit.ts
 var isExitPromptError = (err) => err instanceof Error && (err.name === "ExitPromptError" || err.message.includes("User force closed") || /force closed the prompt/i.test(err.message));
 
+// src/setup/agent-targets.ts
+import { join } from "path";
+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})`],
+  cursor: [join(cursorPluginDir(), "mcp.json"), cursorUserHooks()],
+  vscode: [vscodePluginMcp(), ...vscodeSettingsTargets(exists)],
+  opencode: [
+    openCodePluginFile(),
+    join(openCodePluginDir(), "package.json"),
+    openCodeConfigFile(),
+    openCodeInstructionsFile()
+  ],
+  fx: [fxMcpProfile(), fxSettings(), fxAgentsMd()],
+  ...compatibleRecord((profile) => compatibleTargetPaths(profile)),
+  custom: ["nothing (prints connection details only)"]
+});
+
 // src/cli/enter-key.ts
 var enterKeyListener = (input2 = process.stdin) => {
   if (input2.isTTY !== true) return null;
@@ -881,7 +921,7 @@ var unverifiedKeyClosingReason = (facts) => {
 };
 
 // src/setup/codex-version.ts
-import { dirname, join } from "path";
+import { dirname, join as join2 } from "path";
 var parseCodexVersion = parseVersion;
 var compareCodexVersion = compareVersion;
 var versionFromManifest = (probe, binPath) => {
@@ -896,10 +936,10 @@ var versionFromManifest = (probe, binPath) => {
     }
   };
   let dir = dirname(binPath);
-  const shimVersion = readVersion(join(dir, "node_modules", "@openai", "codex", "package.json"));
+  const shimVersion = readVersion(join2(dir, "node_modules", "@openai", "codex", "package.json"));
   if (shimVersion) return shimVersion;
   for (let depth = 0; depth < 4; depth++) {
-    const version = readVersion(join(dir, "package.json"));
+    const version = readVersion(join2(dir, "package.json"));
     if (version) return version;
     const parent = dirname(dir);
     if (parent === dir) break;
@@ -923,7 +963,7 @@ var readCodexVersion = (probe) => {
 };
 
 // src/setup/codex-bundled.ts
-import { join as join2 } from "path";
+import { dirname as dirname2, join as join3 } from "path";
 var asRecord = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 var codexCliPathFromConfig = (config) => {
   const servers = asRecord(config.mcp_servers);
@@ -934,16 +974,34 @@ var codexCliPathFromConfig = (config) => {
   }
   return null;
 };
+var SYSTEM_CHATGPT_APP = "/Applications/ChatGPT.app";
+var userChatGptApp = (home) => join3(home, "Applications", "ChatGPT.app");
 var bundledCodexCandidates = (home, platform) => platform === "darwin" ? [
-  "/Applications/ChatGPT.app/Contents/Resources/codex",
-  join2(home, "Applications", "ChatGPT.app", "Contents", "Resources", "codex")
+  codexEngineInside(SYSTEM_CHATGPT_APP),
+  codexEngineInside(userChatGptApp(home)),
+  join3(SYSTEM_CHATGPT_APP, "Contents", "Resources", "codex"),
+  join3(userChatGptApp(home), "Contents", "Resources", "codex")
 ] : [];
 var findBundledCodex = (probe) => {
   const config = probe.config();
   const declared = config ? codexCliPathFromConfig(config) : null;
-  if (declared && probe.exists(declared)) return declared;
+  const codex = declared ? probe.engineBehindPusharyLauncher(declared) ?? declared : null;
+  if (codex && probe.exists(codex)) return codex;
   return bundledCodexCandidates(probe.home, probe.platform).find(probe.exists) ?? null;
 };
+var ENGINE_ENTRYPOINT_INSIDE_THE_APP = `/${CODEX_ENGINE_DIRECTORY}/${CODEX_ENGINE_ENTRYPOINT}`;
+var MANIFEST_VERSION = /^\d+\.\d+\.\d+/;
+var codexEngineManifestBeside = (codex) => codex.endsWith(ENGINE_ENTRYPOINT_INSIDE_THE_APP) ? join3(dirname2(dirname2(codex)), CODEX_ENGINE_MANIFEST) : null;
+var parseCodexEngineManifestVersion = (contents) => {
+  let manifest;
+  try {
+    manifest = JSON.parse(contents);
+  } catch {
+    return null;
+  }
+  const version = asRecord(manifest)?.version;
+  return typeof version === "string" ? version.match(MANIFEST_VERSION)?.[0] ?? null : null;
+};
 var parseEmbeddedCodexVersion = (haystack) => haystack.match(/cli_version(\d+\.\d+\.\d+)/)?.[1] ?? null;
 
 // src/setup/telemetry.ts
@@ -1236,10 +1294,10 @@ var installGlobally2 = async () => {
 var _cachedSkillContent = null;
 var fetchSkillContent = async () => {
   if (_cachedSkillContent) return _cachedSkillContent;
-  const __dirname = dirname2(fileURLToPath(import.meta.url));
+  const __dirname = dirname3(fileURLToPath(import.meta.url));
   const candidates = [
-    join3(__dirname, "..", "..", "data", "SKILL.md"),
-    join3(__dirname, "..", "data", "SKILL.md")
+    join4(__dirname, "..", "..", "data", "SKILL.md"),
+    join4(__dirname, "..", "data", "SKILL.md")
   ];
   const source = candidates.find((path) => existsSync(path));
   if (!source) throw new Error("packaged skill not found");
@@ -1249,12 +1307,12 @@ var fetchSkillContent = async () => {
 var writePackagedSkill = async (dir) => {
   const content = await fetchSkillContent();
   if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-  writeFileSync(join3(dir, "SKILL.md"), content, "utf-8");
+  writeFileSync(join4(dir, "SKILL.md"), content, "utf-8");
 };
-var skillsCliInUse = () => isInstalled("skills") || existsSync(join3(homedir(), ".agents", "skills"));
+var skillsCliInUse = () => isInstalled("skills") || existsSync(join4(homedir(), ".agents", "skills"));
 var skillInstallEffects = {
   runSkillsCli: installSkillViaSkillsCli,
-  skillModifiedAt: (dir) => statSync(join3(dir, "SKILL.md"), { throwIfNoEntry: false })?.mtimeMs ?? null,
+  skillModifiedAt: (dir) => statSync(join4(dir, "SKILL.md"), { throwIfNoEntry: false })?.mtimeMs ?? null,
   writePackagedSkill,
   now: () => Date.now()
 };
@@ -1360,7 +1418,7 @@ var setupHermes = async (_apiKey) => {
   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")}`);
 };
-var CODEX_HOOKS_JSON = join3(CODEX_HOME, "hooks.json");
+var CODEX_HOOKS_JSON = join4(CODEX_HOME, "hooks.json");
 var CODEX_HOOKS_MIN_VERSION = [0, 122, 0];
 var codexOnPath = () => {
   const whichCmd = IS_WINDOWS ? "where" : "which";
@@ -1409,6 +1467,24 @@ var readEmbeddedCodexVersion = (path) => {
     }
   }
 };
+var LARGEST_LAUNCHER_BYTES = 64 * 1024;
+var engineBehindPusharyLauncher = (path) => {
+  try {
+    if (statSync(path).size > LARGEST_LAUNCHER_BYTES) return null;
+    return codexEngineBehindLauncher(readFileSync(path, "utf-8"));
+  } catch {
+    return null;
+  }
+};
+var codexEngineManifestVersion = (codex) => {
+  const manifest = codexEngineManifestBeside(codex);
+  if (!manifest) return null;
+  try {
+    return parseCodexEngineManifestVersion(readFileSync(manifest, "utf-8"));
+  } catch {
+    return null;
+  }
+};
 var bundledCodex = () => findBundledCodex({
   config: () => {
     try {
@@ -1418,6 +1494,7 @@ var bundledCodex = () => findBundledCodex({
     }
   },
   exists: existsSync,
+  engineBehindPusharyLauncher,
   home: homedir(),
   platform: process.platform
 });
@@ -1433,7 +1510,7 @@ var detectCodexVersion = () => readCodexVersion({
   },
   bundledVersion: () => {
     const path = bundledCodex();
-    return path ? readEmbeddedCodexVersion(path) : null;
+    return path ? codexEngineManifestVersion(path) ?? readEmbeddedCodexVersion(path) : null;
   },
   brewVersions: () => {
     try {
@@ -1569,7 +1646,7 @@ var setupCodex = async (apiKey) => {
   }
   await installSkill("codex", CODEX_SKILL_DIR);
   await spinner("Teaching Codex to ask via push (~/.codex/AGENTS.md)", async () => {
-    writeInstructionBlock(CODEX_AGENTS_MD, renderAgentInstructions("Codex"));
+    writeInstructionBlock(CODEX_AGENTS_MD, renderAgentInstructions(CODEX_INSTRUCTIONS_LABEL));
   });
   const confirmation = hooksSupported ? await confirmCodexTrust() : null;
   const trustOutcome = confirmation === null ? null : codexTrustOutcome(confirmation, portedTrustWritten);
@@ -1617,17 +1694,17 @@ var setupCodex = async (apiKey) => {
   }
 };
 var resolveBundledPlugin = () => {
-  const dir = dirname2(fileURLToPath(import.meta.url));
+  const dir = dirname3(fileURLToPath(import.meta.url));
   const candidates = [
-    join3(dir, "..", "..", "data", "cursor-plugin"),
-    join3(dir, "..", "data", "cursor-plugin"),
-    join3(dir, "..", "..", "..", "cursor-plugin"),
-    join3(dir, "..", "..", "cursor-plugin")
+    join4(dir, "..", "..", "data", "cursor-plugin"),
+    join4(dir, "..", "data", "cursor-plugin"),
+    join4(dir, "..", "..", "..", "cursor-plugin"),
+    join4(dir, "..", "..", "cursor-plugin")
   ];
-  return candidates.find((p) => existsSync(join3(p, ".cursor-plugin", "plugin.json"))) ?? null;
+  return candidates.find((p) => existsSync(join4(p, ".cursor-plugin", "plugin.json"))) ?? null;
 };
 var installCursorUserHooks = (gateScript) => {
-  const bundled = readJson(join3(CURSOR_PLUGIN_DIR, "hooks", "hooks.json")).hooks ?? {};
+  const bundled = readJson(join4(CURSOR_PLUGIN_DIR, "hooks", "hooks.json")).hooks ?? {};
   let userHooks = {};
   if (existsSync(CURSOR_USER_HOOKS)) {
     const result = readJsonSafe(CURSOR_USER_HOOKS);
@@ -1655,7 +1732,7 @@ var installCursorUserHooks = (gateScript) => {
   writeJson(CURSOR_USER_HOOKS, { ...userHooks, version: userHooks.version ?? 1, hooks });
 };
 var neutralizePluginGate = () => {
-  const path = join3(CURSOR_PLUGIN_DIR, "hooks", "hooks.json");
+  const path = join4(CURSOR_PLUGIN_DIR, "hooks", "hooks.json");
   if (!existsSync(path)) return;
   const data = readJson(path);
   if (!data.hooks) return;
@@ -1678,7 +1755,7 @@ var setupCursor = async (apiKey) => {
   const source = resolveBundledPlugin();
   if (!source) throw new Error("bundled Cursor plugin not found in this package");
   await spinner("Installing Pushary plugin", async () => {
-    const staging = join3(dirname2(CURSOR_PLUGIN_DIR), `${CURSOR_PLUGIN_STAGING_PREFIX}${process.pid}`);
+    const staging = join4(dirname3(CURSOR_PLUGIN_DIR), `${CURSOR_PLUGIN_STAGING_PREFIX}${process.pid}`);
     const backup = `${CURSOR_PLUGIN_DIR}${CURSOR_PLUGIN_BACKUP_INFIX}${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
     rmSync(staging, { recursive: true, force: true });
     try {
@@ -1686,7 +1763,7 @@ var setupCursor = async (apiKey) => {
         recursive: true,
         filter: (p) => !["tools", "node_modules", ".git", ".DS_Store"].includes(basename(p))
       });
-      const staged = readJsonSafe(join3(staging, ".cursor-plugin", "plugin.json"));
+      const staged = readJsonSafe(join4(staging, ".cursor-plugin", "plugin.json"));
       if (staged.kind !== "ok") {
         throw new Error("staged Cursor plugin is missing or has an unreadable plugin.json");
       }
@@ -1704,7 +1781,7 @@ var setupCursor = async (apiKey) => {
     }
   });
   await spinner("Linking your API key", async () => {
-    const mcpPath = join3(CURSOR_PLUGIN_DIR, "mcp.json");
+    const mcpPath = join4(CURSOR_PLUGIN_DIR, "mcp.json");
     const mcp = readAgentJson(mcpPath);
     const servers = mcp.mcpServers ?? {};
     if (servers.pushary) {
@@ -1714,7 +1791,7 @@ var setupCursor = async (apiKey) => {
     }
   });
   await spinner("Registering permission gate (~/.cursor/hooks.json)", async () => {
-    installCursorUserHooks(join3(CURSOR_PLUGIN_DIR, "scripts", "pushary-gate.mjs"));
+    installCursorUserHooks(join4(CURSOR_PLUGIN_DIR, "scripts", "pushary-gate.mjs"));
     neutralizePluginGate();
   });
   console.log();
@@ -1726,18 +1803,18 @@ var setupCursor = async (apiKey) => {
   noteManual("Fully quit and reopen Cursor. A Reload Window may not be enough.");
 };
 var resolveBundledVsCodePlugin = () => {
-  const dir = dirname2(fileURLToPath(import.meta.url));
+  const dir = dirname3(fileURLToPath(import.meta.url));
   const candidates = [
-    join3(dir, "..", "..", "data", "vscode-plugin"),
-    join3(dir, "..", "data", "vscode-plugin"),
-    join3(dir, "..", "..", "..", "vscode-plugin"),
-    join3(dir, "..", "..", "vscode-plugin")
+    join4(dir, "..", "..", "data", "vscode-plugin"),
+    join4(dir, "..", "data", "vscode-plugin"),
+    join4(dir, "..", "..", "..", "vscode-plugin"),
+    join4(dir, "..", "..", "vscode-plugin")
   ];
-  return candidates.find((p) => existsSync(join3(p, ".claude-plugin", "plugin.json"))) ?? null;
+  return candidates.find((p) => existsSync(join4(p, ".claude-plugin", "plugin.json"))) ?? null;
 };
 var pinGuardedVsCodeGate = (pluginDir) => {
-  const hooksPath = join3(pluginDir, "hooks", "hooks.json");
-  const guarded = guardVsCodeGateHooks(readJson(hooksPath), join3(pluginDir, "scripts", CURSOR_GATE_SCRIPT));
+  const hooksPath = join4(pluginDir, "hooks", "hooks.json");
+  const guarded = guardVsCodeGateHooks(readJson(hooksPath), join4(pluginDir, "scripts", CURSOR_GATE_SCRIPT));
   if (guarded.kind === "invalid") throw new Error(guarded.reason);
   writeJson(hooksPath, guarded.document);
 };
@@ -1753,7 +1830,7 @@ var registerVsCodePlugin = (pluginDir) => {
       continue;
     }
     if (current !== null) backupFile(settingsPath);
-    mkdirSync(dirname2(settingsPath), { recursive: true });
+    mkdirSync(dirname3(settingsPath), { recursive: true });
     writeSetupConfigFile(settingsPath, result.content);
     written.push(settingsPath);
   }
@@ -1766,16 +1843,16 @@ var setupVsCode = async (apiKey) => {
   const source = resolveBundledVsCodePlugin();
   if (!source) throw new Error("bundled VS Code plugin not found in this package");
   await spinner("Installing Pushary plugin", async () => {
-    const staging = join3(dirname2(VSCODE_PLUGIN_DIR), `.pushary-staging-vscode-${process.pid}`);
+    const staging = join4(dirname3(VSCODE_PLUGIN_DIR), `.pushary-staging-vscode-${process.pid}`);
     const backup = `${VSCODE_PLUGIN_DIR}.pushary-backup-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
-    mkdirSync(dirname2(VSCODE_PLUGIN_DIR), { recursive: true });
+    mkdirSync(dirname3(VSCODE_PLUGIN_DIR), { recursive: true });
     rmSync(staging, { recursive: true, force: true });
     try {
       cpSync(source, staging, {
         recursive: true,
         filter: (p) => !["tools", "node_modules", ".git", ".DS_Store"].includes(basename(p))
       });
-      const staged = readJsonSafe(join3(staging, ".claude-plugin", "plugin.json"));
+      const staged = readJsonSafe(join4(staging, ".claude-plugin", "plugin.json"));
       if (staged.kind !== "ok") {
         throw new Error("staged VS Code plugin is missing or has an unreadable plugin.json");
       }
@@ -2002,7 +2079,7 @@ var setupGemini = async (apiKey) => {
     writeSetupConfigJson(GEMINI_SETTINGS, settings, KEY_FILE_MODE);
   });
   await spinner("Teaching Gemini to ask via push (~/.gemini/GEMINI.md)", async () => {
-    writeInstructionBlock(GEMINI_MD, renderAgentInstructions("Gemini"));
+    writeInstructionBlock(GEMINI_MD, renderAgentInstructions(GEMINI_INSTRUCTIONS_LABEL));
   });
   console.log();
   console.log(`  ${dim("What this configured:")}`);
@@ -2034,7 +2111,7 @@ var setupOpenCode = async (apiKey) => {
     writeSetupConfigJson(openCodeConfigFile(), config, KEY_FILE_MODE);
   });
   await spinner("Teaching OpenCode to ask via push", async () => {
-    writeInstructionBlock(OPENCODE_INSTRUCTIONS(), renderAgentInstructions("OpenCode"));
+    writeInstructionBlock(OPENCODE_INSTRUCTIONS(), renderAgentInstructions(OPENCODE_INSTRUCTIONS_LABEL));
   });
   console.log();
   console.log(`  ${dim("What this configured:")}`);
@@ -2047,10 +2124,6 @@ var setupOpenCode = async (apiKey) => {
   noteManual("Restart OpenCode to load the plugin.");
   return "configured";
 };
-var compatibleRecord = (of) => HOOK_COMPATIBLE_PROFILES.reduce(
-  (record, profile) => ({ ...record, [profile.agentType]: of(profile) }),
-  {}
-);
 var clearSetupChoiceDecline = (agent) => {
   const declined = declinedAgentForSetupChoice(agent);
   if (declined) clearDeclinedAgent(declined);
@@ -2120,25 +2193,25 @@ var agentIsWired = (agent) => {
       return claudeWired({
         claudeJson: readJson2(CLAUDE_JSON),
         settings: readJson2(CLAUDE_SETTINGS),
-        skillExists: existsSync(join3(CLAUDE_SKILL_DIR, "SKILL.md"))
+        skillExists: existsSync(join4(CLAUDE_SKILL_DIR, "SKILL.md"))
       });
     case "codex": {
       let config = null;
       try {
-        config = parseTOML(readFileSync(join3(CODEX_HOME, "config.toml"), "utf-8"));
+        config = parseTOML(readFileSync(join4(CODEX_HOME, "config.toml"), "utf-8"));
       } catch {
         config = null;
       }
       return codexWired({
         config,
         hooks: readJson2(CODEX_HOOKS_JSON),
-        skillExists: existsSync(join3(CODEX_SKILL_DIR, "SKILL.md"))
+        skillExists: existsSync(join4(CODEX_SKILL_DIR, "SKILL.md"))
       });
     }
     case "gemini_cli":
       return geminiWired({ settings: readJson2(GEMINI_SETTINGS) });
     case "cursor":
-      return existsSync(join3(CURSOR_PLUGIN_DIR, "mcp.json"));
+      return existsSync(join4(CURSOR_PLUGIN_DIR, "mcp.json"));
     case "vscode":
       return existsSync(VSCODE_PLUGIN_MCP);
     case "opencode":
@@ -2183,7 +2256,7 @@ var setupCompatibleAgent = (profile) => async (apiKey) => {
   console.log(`
   ${bold(`Setting up ${profile.label}`)}
 `);
-  if (!isInstalled(profile.binary) && (profile.configDirIsShared || !existsSync(dirname2(configFile)))) {
+  if (!isInstalled(profile.binary) && (profile.configDirIsShared || !existsSync(dirname3(configFile)))) {
     console.log(`  ${yellow("!")} ${profile.label} not found. Skipping.`);
     console.log(`  ${dim(`Install ${profile.label} and re-run setup to configure.`)}`);
     return "skipped";
@@ -2288,8 +2361,8 @@ var offerProjectInstructions = async (agents, options) => {
   });
   if (!wanted) return;
   for (const target of targets) {
-    await spinner(`Writing managed block to ${join3(process.cwd(), target.file)}`, async () => {
-      writeInstructionBlock(join3(process.cwd(), target.file), renderProjectAgentInstructions(target.label));
+    await spinner(`Writing managed block to ${join4(process.cwd(), target.file)}`, async () => {
+      writeInstructionBlock(join4(process.cwd(), target.file), renderProjectAgentInstructions(target.label));
     }, { optional: true });
   }
   console.log(`  ${dim("Commit the file to share it. Teammates without a key fall back to the terminal.")}`);
@@ -2481,23 +2554,7 @@ var resolveAgents = async (options) => {
     validate: (picked) => picked.length > 0 || "Select at least one agent, or re-run with --agents none."
   });
 };
-var AGENT_TARGETS = {
-  claude_code: [CLAUDE_JSON, CLAUDE_SETTINGS, join3(CLAUDE_SKILL_DIR, "SKILL.md")],
-  codex: [join3(CODEX_HOME, "config.toml"), CODEX_HOOKS_JSON, join3(CODEX_SKILL_DIR, "SKILL.md"), CODEX_AGENTS_MD],
-  gemini_cli: [GEMINI_SETTINGS, GEMINI_MD],
-  hermes: [`the Hermes virtualenv (pip install ${HERMES_PIP_PACKAGE})`],
-  cursor: [join3(CURSOR_PLUGIN_DIR, "mcp.json"), CURSOR_USER_HOOKS],
-  vscode: [VSCODE_PLUGIN_MCP, ...vscodeSettingsTargets(existsSync)],
-  opencode: [
-    openCodePluginFile(),
-    join3(openCodePluginDir(), "package.json"),
-    openCodeConfigFile(),
-    OPENCODE_INSTRUCTIONS()
-  ],
-  fx: [fxMcpProfile(), fxSettings(), fxAgentsMd()],
-  ...compatibleRecord((profile) => compatibleTargetPaths(profile)),
-  custom: ["nothing (prints connection details only)"]
-};
+var AGENT_TARGETS = agentSetupTargets(existsSync);
 var reportDryRun = (apiKey, agents, keyCheck, controlMode) => {
   console.log();
   console.log(`  ${bold("Dry run.")} ${dim("Nothing below has been written.")}`);