perf(cli): narrow daemon and gateway cold paths

scripts/write-cli-compat.ts

@@ -26,7 +26,18 @@ const findCandidates = () =>
 const findRunnerCandidates = () =>
   fs.readdirSync(distDir).filter((entry) => {
     const isRunnerBundle =
-      entry === "runners.js" || entry === "runners.mjs" || entry.startsWith("runners-");
+      entry === "runners.js" ||
+      entry === "runners.mjs" ||
+      entry.startsWith("runners-") ||
+      entry === "install.runtime.js" ||
+      entry === "install.runtime.mjs" ||
+      entry.startsWith("install.runtime-") ||
+      entry === "lifecycle.runtime.js" ||
+      entry === "lifecycle.runtime.mjs" ||
+      entry.startsWith("lifecycle.runtime-") ||
+      entry === "status.runtime.js" ||
+      entry === "status.runtime.mjs" ||
+      entry.startsWith("status.runtime-");
     if (!isRunnerBundle) {
       return false;
     }
@@ -61,15 +72,13 @@ const resolved = orderedCandidates
 const orderedRunnerCandidates = runnerCandidates.toSorted();
 
 let daemonTarget: string;
-let runnerTarget: string | null;
 let accessors: Partial<Record<(typeof LEGACY_DAEMON_CLI_EXPORTS)[number], string>>;
-let accessorSources: Partial<
-  Record<(typeof LEGACY_DAEMON_CLI_EXPORTS)[number], "daemonCli" | "daemonCliRunners">
->;
+let accessorSources: Partial<Record<(typeof LEGACY_DAEMON_CLI_EXPORTS)[number], string>>;
+let extraRunnerTargets: Array<{ entry: string; binding: string }>;
 
 if (resolved?.accessors) {
   daemonTarget = resolved.entry;
-  runnerTarget = null;
+  extraRunnerTargets = [];
   accessors = resolved.accessors;
   accessorSources = Object.fromEntries(
     Object.keys(resolved.accessors).map((key) => [key, "daemonCli"]),
@@ -82,34 +91,73 @@ if (resolved?.accessors) {
       return { entry, accessor };
     })
     .find((entry) => Boolean(entry.accessor));
-  const runnerResolved = orderedRunnerCandidates
-    .map((entry) => {
-      const source = fs.readFileSync(path.join(distDir, entry), "utf8");
-      const accessor = resolveLegacyDaemonCliRunnerAccessors(source);
-      return { entry, accessor };
-    })
-    .find((entry) => Boolean(entry.accessor));
+  const runnerAccessors = new Map<
+    Exclude<(typeof LEGACY_DAEMON_CLI_EXPORTS)[number], "registerDaemonCli">,
+    { accessor: string; entry: string }
+  >();
+  for (const entry of orderedRunnerCandidates) {
+    const source = fs.readFileSync(path.join(distDir, entry), "utf8");
+    const resolvedAccessors = resolveLegacyDaemonCliRunnerAccessors(source);
+    if (!resolvedAccessors) {
+      continue;
+    }
+    for (const [name, accessor] of Object.entries(resolvedAccessors)) {
+      if (
+        !accessor ||
+        runnerAccessors.has(
+          name as Exclude<(typeof LEGACY_DAEMON_CLI_EXPORTS)[number], "registerDaemonCli">,
+        )
+      ) {
+        continue;
+      }
+      runnerAccessors.set(
+        name as Exclude<(typeof LEGACY_DAEMON_CLI_EXPORTS)[number], "registerDaemonCli">,
+        { accessor, entry },
+      );
+    }
+  }
 
-  if (!registerResolved?.accessor || !runnerResolved?.accessor) {
+  if (!registerResolved?.accessor || !runnerAccessors.get("runDaemonRestart")) {
     throw new Error(
       `Could not resolve daemon-cli export aliases from dist bundles: ${orderedCandidates.join(", ")} | runners: ${orderedRunnerCandidates.join(", ")}`,
     );
   }
 
   daemonTarget = registerResolved.entry;
-  runnerTarget = runnerResolved.entry;
+  const runnerBindingByEntry = new Map<string, string>();
+  extraRunnerTargets = [];
+  for (const { entry } of runnerAccessors.values()) {
+    if (runnerBindingByEntry.has(entry)) {
+      continue;
+    }
+    const binding = `daemonCliRunners${runnerBindingByEntry.size}`;
+    runnerBindingByEntry.set(entry, binding);
+    extraRunnerTargets.push({ entry, binding });
+  }
   accessors = {
     registerDaemonCli: registerResolved.accessor,
-    ...runnerResolved.accessor,
+    ...Object.fromEntries(
+      [...runnerAccessors.entries()].map(([name, value]) => [name, value.accessor]),
+    ),
   };
   accessorSources = {
     registerDaemonCli: "daemonCli",
-    runDaemonInstall: runnerResolved.accessor.runDaemonInstall ? "daemonCliRunners" : undefined,
-    runDaemonRestart: "daemonCliRunners",
-    runDaemonStart: runnerResolved.accessor.runDaemonStart ? "daemonCliRunners" : undefined,
-    runDaemonStatus: runnerResolved.accessor.runDaemonStatus ? "daemonCliRunners" : undefined,
-    runDaemonStop: runnerResolved.accessor.runDaemonStop ? "daemonCliRunners" : undefined,
-    runDaemonUninstall: runnerResolved.accessor.runDaemonUninstall ? "daemonCliRunners" : undefined,
+    runDaemonInstall: runnerAccessors.get("runDaemonInstall")
+      ? runnerBindingByEntry.get(runnerAccessors.get("runDaemonInstall")!.entry)
+      : undefined,
+    runDaemonRestart: runnerBindingByEntry.get(runnerAccessors.get("runDaemonRestart")!.entry)!,
+    runDaemonStart: runnerAccessors.get("runDaemonStart")
+      ? runnerBindingByEntry.get(runnerAccessors.get("runDaemonStart")!.entry)
+      : undefined,
+    runDaemonStatus: runnerAccessors.get("runDaemonStatus")
+      ? runnerBindingByEntry.get(runnerAccessors.get("runDaemonStatus")!.entry)
+      : undefined,
+    runDaemonStop: runnerAccessors.get("runDaemonStop")
+      ? runnerBindingByEntry.get(runnerAccessors.get("runDaemonStop")!.entry)
+      : undefined,
+    runDaemonUninstall: runnerAccessors.get("runDaemonUninstall")
+      ? runnerBindingByEntry.get(runnerAccessors.get("runDaemonUninstall")!.entry)
+      : undefined,
   };
 }
 
@@ -130,9 +178,10 @@ const buildExportLine = (name: (typeof LEGACY_DAEMON_CLI_EXPORTS)[number]) => {
 const contents =
   "// Legacy shim for pre-tsdown update-cli imports.\n" +
   `import * as daemonCli from "../${daemonTarget}";\n` +
-  (runnerTarget && runnerTarget !== daemonTarget
-    ? `import * as daemonCliRunners from "../${runnerTarget}";\n`
-    : "") +
+  extraRunnerTargets
+    .map(({ entry, binding }) => `import * as ${binding} from "../${entry}";`)
+    .join("\n") +
+  (extraRunnerTargets.length > 0 ? "\n" : "") +
   LEGACY_DAEMON_CLI_EXPORTS.map(buildExportLine).join("\n") +
   "\n";
 

src/cli/daemon-cli-compat.test.ts

@@ -63,4 +63,23 @@ describe("resolveLegacyDaemonCliAccessors", () => {
       runDaemonUninstall: "i",
     });
   });
+
+  it("resolves partial runner bundles for split runtime chunks", () => {
+    const installRuntimeBundle = `
+      export { runDaemonInstall };
+    `;
+    const lifecycleRuntimeBundle = `
+      export { runDaemonRestart as t, runDaemonStart as n, runDaemonStop as r, runDaemonUninstall as i };
+    `;
+
+    expect(resolveLegacyDaemonCliRunnerAccessors(installRuntimeBundle)).toEqual({
+      runDaemonInstall: "runDaemonInstall",
+    });
+    expect(resolveLegacyDaemonCliRunnerAccessors(lifecycleRuntimeBundle)).toEqual({
+      runDaemonRestart: "t",
+      runDaemonStart: "n",
+      runDaemonStop: "r",
+      runDaemonUninstall: "i",
+    });
+  });
 });

src/cli/daemon-cli-compat.ts

@@ -81,13 +81,20 @@ export function resolveLegacyDaemonCliRunnerAccessors(
   const runDaemonStatus = aliases.get("runDaemonStatus");
   const runDaemonStop = aliases.get("runDaemonStop");
   const runDaemonUninstall = aliases.get("runDaemonUninstall");
-  if (!runDaemonRestart) {
+  if (
+    !runDaemonInstall &&
+    !runDaemonRestart &&
+    !runDaemonStart &&
+    !runDaemonStatus &&
+    !runDaemonStop &&
+    !runDaemonUninstall
+  ) {
     return null;
   }
 
   return {
     ...(runDaemonInstall ? { runDaemonInstall } : {}),
-    runDaemonRestart,
+    ...(runDaemonRestart ? { runDaemonRestart } : {}),
     ...(runDaemonStart ? { runDaemonStart } : {}),
     ...(runDaemonStatus ? { runDaemonStatus } : {}),
     ...(runDaemonStop ? { runDaemonStop } : {}),
@@ -100,13 +107,13 @@ export function resolveLegacyDaemonCliAccessors(
 ): LegacyDaemonCliAccessors | null {
   const registerDaemonCli = resolveLegacyDaemonCliRegisterAccessor(bundleSource);
   const runnerAccessors = resolveLegacyDaemonCliRunnerAccessors(bundleSource);
-  if (!registerDaemonCli || !runnerAccessors) {
+  if (!registerDaemonCli || !runnerAccessors?.runDaemonRestart) {
     return null;
   }
 
   const accessors: LegacyDaemonCliAccessors = {
     registerDaemonCli,
-    runDaemonRestart: runnerAccessors.runDaemonRestart!,
+    runDaemonRestart: runnerAccessors.runDaemonRestart,
   };
   if (runnerAccessors.runDaemonInstall) {
     accessors.runDaemonInstall = runnerAccessors.runDaemonInstall;

src/cli/daemon-cli.coverage.test.ts

@@ -1,7 +1,7 @@
 import { Command } from "commander";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { captureEnv } from "../test-utils/env.js";
-import { registerDaemonCli } from "./daemon-cli.js";
+import { registerDaemonCli } from "./daemon-cli/register.js";
 
 const probeGatewayStatus = vi.fn(async (..._args: unknown[]) => ({ ok: true }));
 const resolveGatewayProgramArguments = vi.fn(async (_opts?: unknown) => ({

src/cli/daemon-cli/install.runtime.ts

@@ -0,0 +1 @@
+export { runDaemonInstall } from "./install.js";

src/cli/daemon-cli/lifecycle.runtime.ts

@@ -0,0 +1,6 @@
+export {
+  runDaemonRestart,
+  runDaemonStart,
+  runDaemonStop,
+  runDaemonUninstall,
+} from "./lifecycle.js";

src/cli/daemon-cli/register-service-commands.test.ts

@@ -9,11 +9,17 @@ const runDaemonStatus = vi.fn(async (_opts: unknown) => {});
 const runDaemonStop = vi.fn(async (_opts: unknown) => {});
 const runDaemonUninstall = vi.fn(async (_opts: unknown) => {});
 
-vi.mock("./runners.js", () => ({
+vi.mock("./install.runtime.js", () => ({
   runDaemonInstall: (opts: unknown) => runDaemonInstall(opts),
+}));
+
+vi.mock("./status.runtime.js", () => ({
+  runDaemonStatus: (opts: unknown) => runDaemonStatus(opts),
+}));
+
+vi.mock("./lifecycle.runtime.js", () => ({
   runDaemonRestart: (opts: unknown) => runDaemonRestart(opts),
   runDaemonStart: (opts: unknown) => runDaemonStart(opts),
-  runDaemonStatus: (opts: unknown) => runDaemonStatus(opts),
   runDaemonStop: (opts: unknown) => runDaemonStop(opts),
   runDaemonUninstall: (opts: unknown) => runDaemonUninstall(opts),
 }));

src/cli/daemon-cli/register-service-commands.ts

@@ -2,11 +2,23 @@ import type { Command } from "commander";
 import { inheritOptionFromParent } from "../command-options.js";
 import type { DaemonInstallOptions, GatewayRpcOpts } from "./types.js";
 
-let daemonRunnersModulePromise: Promise<typeof import("./runners.js")> | undefined;
+let daemonInstallModulePromise: Promise<typeof import("./install.runtime.js")> | undefined;
+let daemonLifecycleModulePromise: Promise<typeof import("./lifecycle.runtime.js")> | undefined;
+let daemonStatusModulePromise: Promise<typeof import("./status.runtime.js")> | undefined;
 
-function loadDaemonRunnersModule() {
-  daemonRunnersModulePromise ??= import("./runners.js");
-  return daemonRunnersModulePromise;
+function loadDaemonInstallModule() {
+  daemonInstallModulePromise ??= import("./install.runtime.js");
+  return daemonInstallModulePromise;
+}
+
+function loadDaemonLifecycleModule() {
+  daemonLifecycleModulePromise ??= import("./lifecycle.runtime.js");
+  return daemonLifecycleModulePromise;
+}
+
+function loadDaemonStatusModule() {
+  daemonStatusModulePromise ??= import("./status.runtime.js");
+  return daemonStatusModulePromise;
 }
 
 function resolveInstallOptions(
@@ -47,7 +59,7 @@ export function addGatewayServiceCommands(parent: Command, opts?: { statusDescri
     .option("--deep", "Scan system-level services", false)
     .option("--json", "Output JSON", false)
     .action(async (cmdOpts, command) => {
-      const { runDaemonStatus } = await loadDaemonRunnersModule();
+      const { runDaemonStatus } = await loadDaemonStatusModule();
       await runDaemonStatus({
         rpc: resolveRpcOptions(cmdOpts, command),
         probe: Boolean(cmdOpts.probe),
@@ -66,7 +78,7 @@ export function addGatewayServiceCommands(parent: Command, opts?: { statusDescri
     .option("--force", "Reinstall/overwrite if already installed", false)
     .option("--json", "Output JSON", false)
     .action(async (cmdOpts, command) => {
-      const { runDaemonInstall } = await loadDaemonRunnersModule();
+      const { runDaemonInstall } = await loadDaemonInstallModule();
       await runDaemonInstall(resolveInstallOptions(cmdOpts, command));
     });
 
@@ -75,7 +87,7 @@ export function addGatewayServiceCommands(parent: Command, opts?: { statusDescri
     .description("Uninstall the Gateway service (launchd/systemd/schtasks)")
     .option("--json", "Output JSON", false)
     .action(async (cmdOpts) => {
-      const { runDaemonUninstall } = await loadDaemonRunnersModule();
+      const { runDaemonUninstall } = await loadDaemonLifecycleModule();
       await runDaemonUninstall(cmdOpts);
     });
 
@@ -84,7 +96,7 @@ export function addGatewayServiceCommands(parent: Command, opts?: { statusDescri
     .description("Start the Gateway service (launchd/systemd/schtasks)")
     .option("--json", "Output JSON", false)
     .action(async (cmdOpts) => {
-      const { runDaemonStart } = await loadDaemonRunnersModule();
+      const { runDaemonStart } = await loadDaemonLifecycleModule();
       await runDaemonStart(cmdOpts);
     });
 
@@ -93,7 +105,7 @@ export function addGatewayServiceCommands(parent: Command, opts?: { statusDescri
     .description("Stop the Gateway service (launchd/systemd/schtasks)")
     .option("--json", "Output JSON", false)
     .action(async (cmdOpts) => {
-      const { runDaemonStop } = await loadDaemonRunnersModule();
+      const { runDaemonStop } = await loadDaemonLifecycleModule();
       await runDaemonStop(cmdOpts);
     });
 
@@ -102,7 +114,7 @@ export function addGatewayServiceCommands(parent: Command, opts?: { statusDescri
     .description("Restart the Gateway service (launchd/systemd/schtasks)")
     .option("--json", "Output JSON", false)
     .action(async (cmdOpts) => {
-      const { runDaemonRestart } = await loadDaemonRunnersModule();
+      const { runDaemonRestart } = await loadDaemonLifecycleModule();
       await runDaemonRestart(cmdOpts);
     });
 }

src/cli/daemon-cli/status.runtime.ts

@@ -0,0 +1 @@
+export { runDaemonStatus } from "./status.js";

src/cli/gateway-cli/register.option-collisions.test.ts

@@ -62,7 +62,7 @@ vi.mock("./run.js", () => ({
       .option("--password <password>", "Gateway password"),
 }));
 
-vi.mock("../daemon-cli.js", () => ({
+vi.mock("../daemon-cli/register-service-commands.js", () => ({
   addGatewayServiceCommands: () => undefined,
 }));
 
@@ -70,8 +70,7 @@ vi.mock("../../commands/health.js", () => ({
   formatHealthChannelLines: () => [],
 }));
 
-vi.mock("../../config/config.js", () => ({
-  loadConfig: () => ({}),
+vi.mock("../../config/read-best-effort-config.runtime.js", () => ({
   readBestEffortConfig: async () => ({}),
 }));
 

src/cli/gateway-cli/register.ts

@@ -6,7 +6,7 @@ import { formatDocsLink } from "../../terminal/links.js";
 import { colorize, isRich, theme } from "../../terminal/theme.js";
 import { runCommandWithRuntime } from "../cli-utils.js";
 import { inheritOptionFromParent } from "../command-options.js";
-import { addGatewayServiceCommands } from "../daemon-cli.js";
+import { addGatewayServiceCommands } from "../daemon-cli/register-service-commands.js";
 import { formatHelpExamples } from "../help-format.js";
 import { withProgress } from "../progress.js";
 import { callGatewayCli, gatewayCallOpts } from "./call.js";
@@ -20,7 +20,9 @@ import {
 } from "./discover.js";
 import { addGatewayRunCommand } from "./run.js";
 
-let configModulePromise: Promise<typeof import("../../config/config.js")> | undefined;
+let configModulePromise:
+  | Promise<typeof import("../../config/read-best-effort-config.runtime.js")>
+  | undefined;
 let gatewayStatusModulePromise:
   | Promise<typeof import("../../commands/gateway-status.js")>
   | undefined;
@@ -33,7 +35,7 @@ let healthStyleModulePromise: Promise<typeof import("../../terminal/health-style
 let usageFormatModulePromise: Promise<typeof import("../../utils/usage-format.js")> | undefined;
 
 function loadConfigModule() {
-  configModulePromise ??= import("../../config/config.js");
+  configModulePromise ??= import("../../config/read-best-effort-config.runtime.js");
   return configModulePromise;
 }
 

src/config/read-best-effort-config.runtime.ts

@@ -0,0 +1 @@
+export { readBestEffortConfig } from "./io.js";