@tonyclaw/agent-inspector 3.0.44 → 3.0.46

package/src/cli.ts

@@ -6,11 +6,20 @@ import { fileURLToPath } from "node:url";
 import { dirname, join, resolve as resolvePath } from "node:path";
 import { existsSync } from "node:fs";
 import type { Readable, Writable } from "node:stream";
+import packageJson from "../package.json";
 import {
+  AGENT_INSPECTOR_BASE_PATH_ENV,
   AGENT_INSPECTOR_INTERNAL_STRIPPED_BASE_PATH_ENV,
   appendBasePathToOrigin,
   getConfiguredBasePath,
+  normalizePublicBasePath,
 } from "./lib/basePath.js";
+import {
+  AGENT_INSPECTOR_CLI_ENTRY_ENV,
+  managedInstanceShutdownMessage,
+  readManagedInstanceLaunch,
+  type ManagedInstanceLaunch,
+} from "./lib/managedInstance.js";
 import {
   formatAccessHintLines,
   isLoopbackHost,
@@ -27,8 +36,10 @@ import {
 import {
   closeIdentityProxyGracefully,
   forceCloseIdentityProxy,
+  parseUiOriginAllowlist,
   startIdentityProxy,
   stopIdentityProxyAdmission,
+  type ManagedInstanceControlOptions,
 } from "./proxy/identityProxy.js";
 import { findPidsByPort, killPid, openUrlCommand } from "./proxy/platformCommands.js";
 
@@ -61,19 +72,79 @@ process.title = "Agent Inspector";
  */
 const subcommand = process.argv[2];
 
-if (subcommand === "onboard") {
-  const { runOnboard } = await import("./cli/onboard.js");
-  const code = await runOnboard(process.argv.slice(3));
-  process.exit(code);
-}
+function printGlobalHelp(): void {
+  console.log(`agent-inspector ${packageJson.version} - Agent observability and knowledge capture
+
+Usage:
+  agent-inspector [start] [options]
+  agent-inspector instance <start|list|status|connect|stop|restart> ...
+  agent-inspector alias <list|add|remove> ...
+  agent-inspector onboard [options]
+  agent-inspector doctor [options]
+
+Global options:
+  -h, --help      Show this help without starting a runtime
+  -v, --version   Print the package version
 
-if (subcommand === "doctor") {
-  const { runDoctor } = await import("./cli/doctor.js");
-  const code = await runDoctor(process.argv.slice(3));
-  process.exit(code);
+Start options:
+  --backend-only, --headless  Start the API, proxy, and MCP runtime without serving the UI
+  --with-ui                  Serve the independently built UI through the protected ingress
+  --port, -p <port>          Public ingress port (default: 9527)
+  --host, -H <host>          Bind host (default: 127.0.0.1)
+  --background               Start a hidden supervisor and return after readiness
+  --no-open                  Do not open the UI after startup
+
+Run \`agent-inspector instance --help\`, \`agent-inspector onboard --help\`, or
+\`agent-inspector doctor --help\` for command-specific options.`);
 }
 
-await runStart(process.argv.slice(2));
+switch (subcommand) {
+  case "--help":
+  case "-h":
+    printGlobalHelp();
+    process.exitCode = 0;
+    break;
+  case "--version":
+  case "-v":
+    console.log(packageJson.version);
+    process.exitCode = 0;
+    break;
+  case "onboard": {
+    const { runOnboard } = await import("./cli/onboard.js");
+    const code = await runOnboard(process.argv.slice(3));
+    process.exit(code);
+  }
+  case "doctor": {
+    const { runDoctor } = await import("./cli/doctor.js");
+    const code = await runDoctor(process.argv.slice(3));
+    process.exit(code);
+  }
+  case "alias": {
+    const { runAlias } = await import("./cli/alias.js");
+    const code = await runAlias(process.argv.slice(3));
+    process.exit(code);
+  }
+  case "instance": {
+    const { runInstance } = await import("./cli/instance.js");
+    const code = await runInstance(process.argv.slice(3));
+    process.exitCode = code;
+    break;
+  }
+  case undefined:
+    await runStart(process.argv.slice(2));
+    break;
+  case "start":
+    await runStart(process.argv.slice(3));
+    break;
+  default:
+    if (subcommand.startsWith("-")) {
+      await runStart(process.argv.slice(2));
+    } else {
+      console.error(`agent-inspector: unknown command ${subcommand}`);
+      console.error("Run `agent-inspector --help` for supported commands.");
+      process.exitCode = 2;
+    }
+}
 
 // -----------------------------------------------------------------------------
 // Legacy `start` behavior — start the proxy on the configured port. Extracted
@@ -249,11 +320,26 @@ function readCaptureMode(raw: unknown): CaptureMode | null {
   return typeof value === "string" ? parseCaptureMode(value) : null;
 }
 
-function printAccessHints(port: number, host?: string, basePath = ""): void {
+function printAccessHints(
+  port: number,
+  host: string | undefined,
+  basePath: string,
+  serveUi: boolean,
+  publicOrigin: string | undefined,
+): void {
   const networkUrls = networkUrlsForBindHost(port, host);
-  for (const line of formatAccessHintLines(port, networkUrls, host, basePath)) {
+  for (const line of formatAccessHintLines(port, networkUrls, host, basePath, serveUi)) {
     console.log(line);
   }
+  if (publicOrigin !== undefined) {
+    const publicBaseUrl = appendBasePathToOrigin(publicOrigin, "/", basePath);
+    if (serveUi) console.log(`   Public UI:      ${publicBaseUrl}`);
+    console.log(`   Public control Base: ${publicBaseUrl}`);
+    console.log(`   Public agent Base:   ${publicBaseUrl}`);
+    console.log(`   Public REST API: ${appendBasePathToOrigin(publicOrigin, "/api", basePath)}`);
+    console.log(`   Public proxy:    ${appendBasePathToOrigin(publicOrigin, "/proxy", basePath)}`);
+    console.log(`   Public MCP:     ${appendBasePathToOrigin(publicOrigin, "/api/mcp", basePath)}`);
+  }
   if (!isLoopbackHost(host)) {
     const proxyTokenConfigured = (process.env["AGENT_INSPECTOR_PROXY_TOKEN"] ?? "") !== "";
     const legacyProxyEnabled =
@@ -285,6 +371,19 @@ function readPositiveIntegerEnv(name: string): number | undefined {
   return undefined;
 }
 
+function normalizeExplicitPublicOrigin(value: string | undefined): string | null | undefined {
+  if (value === undefined || value.trim().length === 0) return undefined;
+  try {
+    const parsed = new URL(value.trim());
+    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return null;
+    if (parsed.username.length > 0 || parsed.password.length > 0) return null;
+    if (parsed.pathname !== "/" || parsed.search.length > 0 || parsed.hash.length > 0) return null;
+    return parsed.origin;
+  } catch {
+    return null;
+  }
+}
+
 type BackgroundSupervisorOptions = {
   port: number;
   host: string | undefined;
@@ -293,6 +392,7 @@ type BackgroundSupervisorOptions = {
   captureMode: CaptureMode;
   enableIdentityProxy: boolean;
   legacyAliasEnabled: boolean;
+  serveUi: boolean;
 };
 
 function buildBackgroundSupervisorArgs(options: BackgroundSupervisorOptions): string[] {
@@ -312,6 +412,9 @@ function buildBackgroundSupervisorArgs(options: BackgroundSupervisorOptions): st
   if (options.legacyAliasEnabled) {
     args.push("--legacy-port");
   }
+  if (!options.serveUi) {
+    args.push("--backend-only");
+  }
   return args;
 }
 
@@ -335,16 +438,17 @@ function pickUpstreamPort(publicPort: number, legacyAliasPort: number | null): n
   return DEFAULT_UPSTREAM_PORT;
 }
 
-/** Try to start the identity proxy. Returns `null` (and prints a warning)
- *  if the listen port is already in use by another process — e.g. when
- *  restarting a previous instance that didn't shut down cleanly. The
- *  TanStack Start server keeps running either way; clients just lose the
- *  per-PID attribution until they fall back to direct port `port` access. */
+/** Try to start an identity-proxy ingress. The primary caller treats a
+ *  `null` result as fatal; only an optional compatibility alias may degrade. */
 async function tryStartIdentityProxy(
   identityPort: number,
   upstreamPort: number,
   listenHost: string,
   upstreamHost: string,
+  managedInstance: ManagedInstanceControlOptions | undefined,
+  allowedUiOrigins: readonly string[],
+  uiDirectory: string | undefined,
+  publicOrigin: string | undefined,
 ): Promise<import("node:http").Server | null> {
   try {
     const server = await startIdentityProxy({
@@ -362,22 +466,30 @@ async function tryStartIdentityProxy(
         .split(",")
         .map((host) => host.trim())
         .filter((host) => host.length > 0),
+      allowedUiOrigins,
+      uiDirectory,
+      publicOrigin,
       maxRequestBytes: readPositiveIntegerEnv("AGENT_INSPECTOR_MAX_REQUEST_BYTES"),
       requestTimeoutMs: readPositiveIntegerEnv("AGENT_INSPECTOR_REQUEST_TIMEOUT_MS"),
+      managedInstance,
     });
     return server;
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    console.warn(
-      `[identity-proxy] Could not listen on port ${identityPort}: ${message}. ` +
-        `Falling back to OS-scan heuristic on port ${upstreamPort}. ` +
-        `Pass --identity-proxy-port <n> to choose another port, or --no-identity-proxy to disable.`,
-    );
+    console.warn(`[identity-proxy] Could not listen on port ${identityPort}: ${message}.`);
     return null;
   }
 }
 
 async function runStart(args: string[]): Promise<void> {
+  const managedLaunchResult = readManagedInstanceLaunch(process.env);
+  if (managedLaunchResult.kind === "invalid") {
+    console.error(managedLaunchResult.message);
+    process.exitCode = 1;
+    return;
+  }
+  const managedLaunch: ManagedInstanceLaunch | null =
+    managedLaunchResult.kind === "managed" ? managedLaunchResult.launch : null;
   const envPort = process.env["AGENT_INSPECTOR_PORT"] ?? process.env["PORT"];
   const portDefault = envPort !== undefined ? Number(envPort) : DEFAULT_PORT;
   const envHost = process.env["NITRO_HOST"] ?? process.env["HOST"];
@@ -397,6 +509,7 @@ async function runStart(args: string[]): Promise<void> {
   let captureModeWasSpecified = false;
   let enableIdentityProxy = true;
   let legacyAliasEnabled = false;
+  let serveUi = process.env["AGENT_INSPECTOR_BACKEND_ONLY"] !== "1";
 
   if (envMode !== undefined && envMode !== "") {
     const parsedMode = parseCaptureMode(envMode);
@@ -417,6 +530,10 @@ async function runStart(args: string[]): Promise<void> {
 
   for (let i = 0; i < args.length; i++) {
     const arg = args[i] ?? "";
+    if (arg.startsWith("--port=")) {
+      port = Number(arg.slice(arg.indexOf("=") + 1));
+      continue;
+    }
     if (arg.startsWith("--host=")) {
       const value = arg.slice(arg.indexOf("=") + 1).trim();
       if (!isValidBindHost(value)) {
@@ -472,6 +589,14 @@ async function runStart(args: string[]): Promise<void> {
       case "--background":
         background = true;
         break;
+      case "--backend-only":
+      case "--headless":
+        serveUi = false;
+        open = false;
+        break;
+      case "--with-ui":
+        serveUi = true;
+        break;
       case "--config-dir":
         configDir = args[i + 1];
         i++;
@@ -515,8 +640,19 @@ async function runStart(args: string[]): Promise<void> {
       case "--legacy-port":
         legacyAliasEnabled = true;
         break;
+      case "--help":
+      case "-h":
+        printGlobalHelp();
+        return;
+      case "--version":
+      case "-v":
+        console.log(packageJson.version);
+        return;
       default:
-        break;
+        console.error(`agent-inspector start: unknown option ${arg}`);
+        console.error("Run `agent-inspector --help` for supported options.");
+        process.exitCode = 2;
+        return;
     }
   }
 
@@ -533,6 +669,40 @@ async function runStart(args: string[]): Promise<void> {
     process.exitCode = 1;
     return;
   }
+  if (!serveUi) open = false;
+  if (!enableIdentityProxy && serveUi) {
+    console.error(
+      "The decoupled UI is composed only by the protected ingress. Use --backend-only with --no-identity-proxy, or keep the identity proxy enabled.",
+    );
+    process.exitCode = 1;
+    return;
+  }
+  const uiOriginAllowlist = parseUiOriginAllowlist(process.env["AGENT_INSPECTOR_UI_ORIGINS"]);
+  if (uiOriginAllowlist.rejected.length > 0) {
+    console.error(
+      `Invalid AGENT_INSPECTOR_UI_ORIGINS entries: ${uiOriginAllowlist.rejected.join(", ")}. Only exact loopback http(s) origins are accepted; use a same-origin authenticated gateway for remote UI hosting.`,
+    );
+    process.exitCode = 1;
+    return;
+  }
+  const publicOrigin = normalizeExplicitPublicOrigin(process.env["AGENT_INSPECTOR_PUBLIC_ORIGIN"]);
+  if (publicOrigin === null) {
+    console.error(
+      "Invalid AGENT_INSPECTOR_PUBLIC_ORIGIN. Use an exact http(s) origin without credentials, path, query, or fragment.",
+    );
+    process.exitCode = 1;
+    return;
+  }
+  const uiDirectoryCandidate = join(__dirname, "../.output/ui");
+  const uiIndexPath = join(uiDirectoryCandidate, "index.html");
+  const uiDirectory = serveUi && existsSync(uiIndexPath) ? uiDirectoryCandidate : undefined;
+  if (serveUi && uiDirectory === undefined) {
+    console.error(
+      `Agent Inspector UI artifact is missing at ${uiIndexPath}. Run the composed build or use --backend-only.`,
+    );
+    process.exitCode = 1;
+    return;
+  }
 
   /**
    * Check if a port is in use and kill the process using it
@@ -551,15 +721,41 @@ async function runStart(args: string[]): Promise<void> {
   // TanStack Start listens on the private upstream port; identity proxies own
   // the public-facing port(s). When the identity proxy is disabled we fall
   // back to TanStack listening on the public port directly.
-  const upstreamPort = enableIdentityProxy ? pickUpstreamPort(port, legacyAliasPort) : port;
+  const upstreamPort =
+    managedLaunch === null
+      ? enableIdentityProxy
+        ? pickUpstreamPort(port, legacyAliasPort)
+        : port
+      : managedLaunch.upstreamPort;
+  if (
+    upstreamPort < 1 ||
+    upstreamPort > 65_535 ||
+    (enableIdentityProxy && upstreamPort === port) ||
+    upstreamPort === legacyAliasPort
+  ) {
+    console.error(`Invalid managed upstream port: ${String(upstreamPort)}.`);
+    process.exitCode = 1;
+    return;
+  }
   const upstreamHost = enableIdentityProxy ? DEFAULT_BIND_HOST : host;
   process.env["PORT"] = String(upstreamPort);
 
+  const configuredBasePath = process.env[AGENT_INSPECTOR_BASE_PATH_ENV];
+  if (configuredBasePath !== undefined && normalizePublicBasePath(configuredBasePath) === null) {
+    console.error(
+      `Invalid ${AGENT_INSPECTOR_BASE_PATH_ENV}. Use / for root or URL-safe path segments such as /inspector or /foo-bar/v1.`,
+    );
+    process.exitCode = 1;
+    return;
+  }
   const basePath = getConfiguredBasePath(process.env);
-  const url = urlForHost(port, host);
-  const uiUrl = appendBasePathToOrigin(url, "/", basePath);
-  const proxyUrl = appendBasePathToOrigin(url, "/proxy", basePath);
-  const proxyMessagesUrl = appendBasePathToOrigin(url, "/proxy/v1/messages", basePath);
+  const bindOrigin = urlForHost(port, host);
+  const outwardOrigin = publicOrigin ?? bindOrigin;
+  const surfaceBaseUrl = appendBasePathToOrigin(outwardOrigin, "/", basePath);
+  const uiUrl = serveUi ? surfaceBaseUrl : null;
+  const proxyUrl = appendBasePathToOrigin(outwardOrigin, "/proxy", basePath);
+  const openAiProxyUrl = appendBasePathToOrigin(outwardOrigin, "/proxy/v1", basePath);
+  const proxyMessagesUrl = appendBasePathToOrigin(outwardOrigin, "/proxy/v1/messages", basePath);
   const legacyUrl =
     legacyAliasPort === null
       ? null
@@ -574,8 +770,10 @@ async function runStart(args: string[]): Promise<void> {
       : appendBasePathToOrigin(localUrlForPort(legacyAliasPort), "/api/mcp", basePath);
 
   if (!forceRestart && (await isInspectorHealthy(port, host, basePath))) {
-    console.log(`agent-inspector is already running at ${uiUrl}`);
-    printAccessHints(port, host, basePath);
+    console.log(
+      `agent-inspector ${serveUi ? "is already running" : "backend is already running"} at ${surfaceBaseUrl}`,
+    );
+    printAccessHints(port, host, basePath, serveUi, publicOrigin);
     if (captureModeWasSpecified) {
       const runningMode = await getRunningCaptureMode(port, host, basePath);
       if (runningMode !== null && runningMode !== captureMode) {
@@ -584,7 +782,7 @@ async function runStart(args: string[]): Promise<void> {
       }
     }
     console.log(`Use --force-restart to restart the existing instance.`);
-    if (open && openWasSpecified) {
+    if (open && openWasSpecified && uiUrl !== null) {
       openBrowser(uiUrl);
     }
     return;
@@ -625,11 +823,12 @@ async function runStart(args: string[]): Promise<void> {
       captureMode,
       enableIdentityProxy,
       legacyAliasEnabled,
+      serveUi,
     });
     const supervisorProcess = spawn(process.execPath, [cliEntry, ...supervisorArgs], {
       stdio: "ignore",
       detached: true,
-      env: process.env,
+      env: { ...process.env, [AGENT_INSPECTOR_CLI_ENTRY_ENV]: cliEntry },
       windowsHide: true,
     });
     supervisorProcess.once("error", (err) => {
@@ -638,8 +837,10 @@ async function runStart(args: string[]): Promise<void> {
     supervisorProcess.unref();
 
     if (await waitForInspectorHealthy(port, 10000, host, basePath)) {
-      console.log(`agent-inspector background server is ready at ${uiUrl}`);
-      printAccessHints(port, host, basePath);
+      console.log(
+        `agent-inspector background ${serveUi ? "server" : "backend"} is ready at ${surfaceBaseUrl}`,
+      );
+      printAccessHints(port, host, basePath, serveUi, publicOrigin);
       if (legacyProxyUrl !== null && legacyMcpUrl !== null) {
         console.log(`   Legacy proxy:  ${legacyProxyUrl}`);
         console.log(`   Legacy MCP:    ${legacyMcpUrl}`);
@@ -648,48 +849,18 @@ async function runStart(args: string[]): Promise<void> {
       console.log(`Route AI coding tools through the identity proxy for accurate PID attribution:`);
       console.log(`   Claude Code:  ANTHROPIC_BASE_URL=${proxyUrl} claude`);
       console.log(`   OpenCode:     LLM_BASE_URL=${proxyUrl} opencode`);
-      console.log(`   MiMo Code:    OPENAI_BASE_URL=${proxyUrl} mimo`);
-      if (open && openWasSpecified) {
+      console.log(`   MiMo Code:    OPENAI_BASE_URL=${openAiProxyUrl} mimo`);
+      if (open && openWasSpecified && uiUrl !== null) {
         openBrowser(uiUrl);
       }
       return;
     }
 
-    console.error(`agent-inspector background server did not become ready at ${uiUrl}.`);
+    console.error(`agent-inspector background server did not become ready at ${surfaceBaseUrl}.`);
     process.exitCode = 1;
     return;
   }
 
-  console.log(`Server running at ${uiUrl}`);
-  console.log(`   Capture mode: ${captureMode}`);
-  console.log(`   Proxy: ${proxyUrl}`);
-  printAccessHints(port, host, basePath);
-  if (legacyUrl !== null && legacyProxyUrl !== null && legacyMcpUrl !== null) {
-    console.log(`   Legacy UI:      ${legacyUrl}`);
-    console.log(`   Legacy proxy:   ${legacyProxyUrl}`);
-    console.log(`   Legacy MCP:     ${legacyMcpUrl}`);
-  }
-  console.log(``);
-  console.log(`Route AI coding tools through the proxy:`);
-  console.log(`   Claude Code:  ANTHROPIC_BASE_URL=${proxyUrl} claude`);
-  console.log(`   OpenCode:     LLM_BASE_URL=${proxyUrl} opencode`);
-  console.log(`   MiMo Code:    OPENAI_BASE_URL=${proxyUrl} mimo`);
-  console.log(`   Direct HTTP:  curl ${proxyMessagesUrl} -d '{"model":"...","messages":[...]}'`);
-  console.log(
-    `   Remote/container tools: use the Network proxy URL above when shown; otherwise restart with --host 0.0.0.0 or a reachable IP.`,
-  );
-  console.log(``);
-  console.log(`Routing environment variables:`);
-  console.log(`   ROUTES            JSON map of model prefix -> upstream URL`);
-  console.log(`   DEFAULT_UPSTREAM  Fallback upstream for unmatched models`);
-  console.log(
-    `   Example: ROUTES='{"claude-":"https://api.anthropic.com","MiniMax":"https://api.minimaxi.com/anthropic"}'`,
-  );
-
-  if (open) {
-    openBrowser(uiUrl);
-  }
-
   // Compute server path
   const outputDir = __dirname;
   const serverPath = join(outputDir, "../.output/server/index.mjs");
@@ -697,6 +868,10 @@ async function runStart(args: string[]): Promise<void> {
 
   // Start the server with the branded Windows runtime when postinstall created it.
   const serverEnv = { ...process.env };
+  const currentCliEntry = process.env[AGENT_INSPECTOR_CLI_ENTRY_ENV] ?? process.argv[1];
+  if (currentCliEntry !== undefined && currentCliEntry.length > 0) {
+    serverEnv[AGENT_INSPECTOR_CLI_ENTRY_ENV] = currentCliEntry;
+  }
   if (configDir !== undefined) {
     // Normalize MSYS / Git Bash paths to Windows native form.
     // On Windows, `path.join('/c/Users/foo')` becomes `\c\Users\foo`
@@ -727,12 +902,20 @@ async function runStart(args: string[]): Promise<void> {
   serverEnv["AGENT_INSPECTOR_PUBLIC_PORT"] = String(port);
   serverEnv["PROXY_PORT"] = String(port);
   serverEnv["AGENT_INSPECTOR_CAPTURE_MODE"] = captureMode;
+  serverEnv["AGENT_INSPECTOR_BACKEND_ONLY"] = serveUi ? "0" : "1";
   const workerDir = join(__dirname, "workers");
   if (existsSync(workerDir)) {
     serverEnv["AGENT_INSPECTOR_WORKER_DIR"] = workerDir;
   }
   const serverProcess = spawn(serverCommand.command, serverCommand.args, {
-    stdio: background ? ["ignore", "ignore", "ignore"] : ["ignore", "pipe", "pipe"],
+    stdio:
+      managedLaunch === null
+        ? background
+          ? ["ignore", "ignore", "ignore"]
+          : ["ignore", "pipe", "pipe"]
+        : background
+          ? ["ignore", "ignore", "ignore", "ipc"]
+          : ["ignore", "pipe", "pipe", "ipc"],
     detached: background,
     env: serverEnv,
     windowsHide: background,
@@ -764,7 +947,13 @@ async function runStart(args: string[]): Promise<void> {
   const requestSupervisorShutdown = (signal: "SIGINT" | "SIGTERM"): void => {
     if (supervisorShutdownPromise !== null) return;
     for (const proxy of identityProxies) stopIdentityProxyAdmission(proxy.server);
-    serverProcess.kill(signal);
+    if (managedLaunch !== null && serverProcess.connected) {
+      serverProcess.send(managedInstanceShutdownMessage(managedLaunch.controlToken), (error) => {
+        if (error !== null && serverProcess.exitCode === null) serverProcess.kill(signal);
+      });
+    } else {
+      serverProcess.kill(signal);
+    }
 
     const childDeadline =
       readPositiveIntegerEnv("AGENT_INSPECTOR_SHUTDOWN_TIMEOUT_MS") ?? DEFAULT_SHUTDOWN_DEADLINE_MS;
@@ -795,17 +984,54 @@ async function runStart(args: string[]): Promise<void> {
   const currentSupervisorShutdown = (): Promise<void> | null => supervisorShutdownPromise;
   process.on("SIGINT", handleSigint);
   process.on("SIGTERM", handleSigterm);
+  const managedInstanceControl: ManagedInstanceControlOptions | undefined =
+    managedLaunch === null
+      ? undefined
+      : {
+          name: managedLaunch.name,
+          instanceId: managedLaunch.instanceId,
+          launchId: managedLaunch.launchId,
+          controlToken: managedLaunch.controlToken,
+          supervisorPid: process.pid,
+          startedAt: managedLaunch.startedAt,
+          publicPort: port,
+          upstreamPort,
+          requestShutdown: () => requestSupervisorShutdown("SIGTERM"),
+        };
   if (enableIdentityProxy) {
-    const primaryProxy = await tryStartIdentityProxy(port, upstreamPort, host, upstreamHost);
-    if (primaryProxy !== null) {
-      identityProxies.push({ label: "primary", port, server: primaryProxy });
+    const primaryProxy = await tryStartIdentityProxy(
+      port,
+      upstreamPort,
+      host,
+      upstreamHost,
+      managedInstanceControl,
+      uiOriginAllowlist.origins,
+      uiDirectory,
+      publicOrigin,
+    );
+    if (primaryProxy === null) {
+      console.error(
+        `Agent Inspector could not bind its protected public ingress at ${bindOrigin}; stopping the private backend.`,
+      );
+      requestSupervisorShutdown("SIGTERM");
+      const failedStartupShutdown = currentSupervisorShutdown();
+      if (failedStartupShutdown !== null) await failedStartupShutdown;
+      process.off("SIGINT", handleSigint);
+      process.off("SIGTERM", handleSigterm);
+      process.exitCode = 1;
+      return;
     }
+    identityProxies.push({ label: "primary", port, server: primaryProxy });
     if (legacyAliasPort !== null) {
       const legacyProxy = await tryStartIdentityProxy(
         legacyAliasPort,
         upstreamPort,
         host,
         upstreamHost,
+        managedInstanceControl,
+        uiOriginAllowlist.origins,
+        uiDirectory,
+        publicOrigin,
       );
       if (legacyProxy !== null) {
         identityProxies.push({ label: "legacy", port: legacyAliasPort, server: legacyProxy });
@@ -819,11 +1045,13 @@ async function runStart(args: string[]): Promise<void> {
     // not started yet so the public port is not yet accepting traffic.
     const upstreamProbeBasePath = enableIdentityProxy ? "" : basePath;
     if (await waitForInspectorHealthy(upstreamPort, 5000, host, upstreamProbeBasePath)) {
-      console.log(`agent-inspector background server is ready at ${uiUrl}`);
+      console.log(
+        `agent-inspector background ${serveUi ? "server" : "backend"} is ready at ${surfaceBaseUrl}`,
+      );
       if (identityProxies.length > 0) {
         console.log(`Identity proxy ready on port ${port} (PID-attributing proxy).`);
       }
-      printAccessHints(port, host, basePath);
+      printAccessHints(port, host, basePath, serveUi, publicOrigin);
       if (legacyProxyUrl !== null && legacyMcpUrl !== null) {
         console.log(`   Legacy proxy:  ${legacyProxyUrl}`);
         console.log(`   Legacy MCP:    ${legacyMcpUrl}`);
@@ -834,7 +1062,7 @@ async function runStart(args: string[]): Promise<void> {
           `Route AI coding tools through the identity proxy for accurate PID attribution:`,
           `   Claude Code:  ANTHROPIC_BASE_URL=${proxyUrl} claude`,
           `   OpenCode:     LLM_BASE_URL=${proxyUrl} opencode`,
-          `   MiMo Code:    OPENAI_BASE_URL=${proxyUrl} mimo`,
+          `   MiMo Code:    OPENAI_BASE_URL=${openAiProxyUrl} mimo`,
           legacyProxyUrl === null
             ? `   Override the port with --port <n> when needed.`
             : `   Legacy configs using ${legacyProxyUrl} still work.`,
@@ -842,14 +1070,25 @@ async function runStart(args: string[]): Promise<void> {
       }
       return;
     }
-    console.error(`agent-inspector background server did not become ready at ${uiUrl}.`);
+    console.error(`agent-inspector background server did not become ready at ${surfaceBaseUrl}.`);
+    process.exitCode = 1;
+    return;
+  }
+
+  if (!(await waitForInspectorHealthy(port, 10_000, host, basePath))) {
+    console.error(`Agent Inspector did not become ready at ${surfaceBaseUrl}; stopping startup.`);
+    requestSupervisorShutdown("SIGTERM");
+    const failedStartupShutdown = currentSupervisorShutdown();
+    if (failedStartupShutdown !== null) await failedStartupShutdown;
+    process.off("SIGINT", handleSigint);
+    process.off("SIGTERM", handleSigterm);
     process.exitCode = 1;
     return;
   }
 
   if (identityProxies.length > 0) {
     console.log(``);
-    console.log(`Identity proxy ready at ${url} (PID-attributing public entrypoint).`);
+    console.log(`Identity proxy ready at ${bindOrigin} (PID-attributing ingress).`);
     if (legacyAliasPort !== null) {
       const legacyReady = identityProxies.some((proxy) => proxy.label === "legacy");
       if (legacyReady) {
@@ -861,6 +1100,28 @@ async function runStart(args: string[]): Promise<void> {
     }
   }
 
+  console.log(
+    `${serveUi ? "UI and backend" : "Backend control and agent runtime"} running at ${surfaceBaseUrl}`,
+  );
+  console.log(`   Capture mode: ${captureMode}`);
+  console.log(`   Proxy: ${proxyUrl}`);
+  printAccessHints(port, host, basePath, serveUi, publicOrigin);
+  if (legacyUrl !== null && legacyProxyUrl !== null && legacyMcpUrl !== null) {
+    console.log(`   Legacy UI:      ${legacyUrl}`);
+    console.log(`   Legacy proxy:   ${legacyProxyUrl}`);
+    console.log(`   Legacy MCP:     ${legacyMcpUrl}`);
+  }
+  console.log(``);
+  console.log(`Route AI coding tools through the proxy:`);
+  console.log(`   Claude Code:  ANTHROPIC_BASE_URL=${proxyUrl} claude`);
+  console.log(`   OpenCode:     LLM_BASE_URL=${proxyUrl} opencode`);
+  console.log(`   MiMo Code:    OPENAI_BASE_URL=${openAiProxyUrl} mimo`);
+  console.log(`   Direct HTTP:  curl ${proxyMessagesUrl} -d '{"model":"...","messages":[...]}'`);
+  console.log(
+    `   Remote/container tools: use the Network proxy URL above when shown; otherwise restart with --host 0.0.0.0 or a reachable IP.`,
+  );
+  if (open && uiUrl !== null) openBrowser(uiUrl);
+
   process.exitCode = await serverExit;
 
   const activeSupervisorShutdown = currentSupervisorShutdown();