@tonyclaw/agent-inspector 3.1.20 → 3.1.22

package/src/cli/doctor.ts

@@ -35,6 +35,7 @@ export type DoctorOptions = {
   chromeExtension: boolean;
   fix: boolean;
   json: boolean;
+  supportBundle: boolean;
   verbose: boolean;
   help: boolean;
 };
@@ -48,6 +49,12 @@ export type HealthProbe = {
   status: number | null;
 };
 
+export type ReadinessProbe = {
+  ok: boolean;
+  status: number | null;
+  body: unknown;
+};
+
 export type DoctorDeps = {
   env: Readonly<Record<string, string | undefined>>;
   platform: typeof process.platform;
@@ -57,17 +64,35 @@ export type DoctorDeps = {
   listDir: (path: string) => readonly string[] | null;
   stat: (path: string) => { isDirectory: boolean; size: number } | null;
   fetchHealth: (port: number, basePath: string) => Promise<HealthProbe>;
+  fetchReadiness: (port: number, basePath: string) => Promise<ReadinessProbe>;
   isPortOpen: (port: number) => Promise<boolean>;
 };
 
 export type DoctorReport = {
   checks: readonly DoctorCheck[];
+  readiness: ReadinessProbe | null;
   passCount: number;
   warnCount: number;
   failCount: number;
   exitCode: number;
 };
 
+export type DoctorSupportBundle = {
+  schema: "agent-inspector.support-bundle/v1";
+  createdAt: string;
+  report: DoctorReport;
+  environment: {
+    platform: typeof process.platform;
+    cwd: string;
+    basePath: string;
+    port: number;
+    hasControlToken: boolean;
+    hasProxyToken: boolean;
+    hasProviderJsonOverride: boolean;
+  };
+  storage: readonly DoctorCheck[];
+};
+
 function check(name: string, severity: DoctorSeverity, message: string, hint = ""): DoctorCheck {
   return {
     name,
@@ -96,6 +121,7 @@ export function parseDoctorArgs(
     chromeExtension: false,
     fix: false,
     json: false,
+    supportBundle: false,
     verbose: false,
     help: false,
   };
@@ -146,6 +172,10 @@ export function parseDoctorArgs(
       case "--json":
         options.json = true;
         break;
+      case "--support-bundle":
+        options.supportBundle = true;
+        options.json = true;
+        break;
       case "--verbose":
         options.verbose = true;
         break;
@@ -316,6 +346,42 @@ async function checkProxyHealth(port: number, deps: DoctorDeps): Promise<DoctorC
   );
 }
 
+function readinessChecks(readiness: ReadinessProbe): readonly DoctorCheck[] {
+  if (!readiness.ok) {
+    const suffix = readiness.status === null ? "" : ` (HTTP ${readiness.status})`;
+    return [
+      check(
+        "Readiness",
+        "warn",
+        `Readiness probe is unavailable${suffix}.`,
+        "Use /readyz locally or run with --verbose for storage and worker hints.",
+      ),
+    ];
+  }
+  if (!isObject(readiness.body)) {
+    return [check("Readiness", "warn", "Readiness response was not an object.")];
+  }
+  const status = readiness.body["status"];
+  const checks = readiness.body["checks"];
+  if (typeof status !== "string" || !isObject(checks)) {
+    return [check("Readiness", "warn", "Readiness response did not include status/checks.")];
+  }
+  const degraded = Object.entries(checks)
+    .filter(([, value]) => value !== "ok")
+    .map(([name, value]) => `${name}=${String(value)}`);
+  if (degraded.length === 0) {
+    return [check("Readiness", "pass", `Runtime readiness is ${status}.`)];
+  }
+  return [
+    check(
+      "Readiness",
+      status === "unavailable" ? "fail" : "warn",
+      `Runtime readiness is ${status}: ${degraded.join(", ")}.`,
+      "Inspect /readyz and /metrics for safe aggregate runtime details.",
+    ),
+  ];
+}
+
 function findProjectRoot(startDir: string, deps: Pick<DoctorDeps, "exists">): string {
   let current = resolve(startDir);
   for (let i = 0; i < 6; i++) {
@@ -549,8 +615,11 @@ export async function buildDoctorReport(
   deps: DoctorDeps = createDoctorDeps(),
 ): Promise<DoctorReport> {
   const rootDir = findProjectRoot(deps.cwd, deps);
+  const basePath = getConfiguredBasePath(deps.env);
+  const readiness = await deps.fetchReadiness(options.port, basePath);
   const coreChecks = [
     await checkProxyHealth(options.port, deps),
+    ...readinessChecks(readiness),
     checkProviderConfig(options, deps),
     checkPackage(rootDir, deps),
   ];
@@ -567,6 +636,7 @@ export async function buildDoctorReport(
 
   return {
     checks,
+    readiness,
     passCount,
     warnCount,
     failCount,
@@ -574,6 +644,31 @@ export async function buildDoctorReport(
   };
 }
 
+export function buildDoctorSupportBundle(
+  options: DoctorOptions,
+  deps: DoctorDeps,
+  report: DoctorReport,
+): DoctorSupportBundle {
+  return {
+    schema: "agent-inspector.support-bundle/v1",
+    createdAt: new Date().toISOString(),
+    report,
+    environment: {
+      platform: deps.platform,
+      cwd: deps.cwd,
+      basePath: getConfiguredBasePath(deps.env),
+      port: options.port,
+      hasControlToken:
+        deps.env["AGENT_INSPECTOR_CONTROL_TOKEN"] !== undefined ||
+        deps.env["AGENT_INSPECTOR_API_TOKEN"] !== undefined,
+      hasProxyToken: deps.env["AGENT_INSPECTOR_PROXY_TOKEN"] !== undefined,
+      hasProviderJsonOverride:
+        options.providersJson !== null || deps.env["AGENT_INSPECTOR_PROVIDERS_JSON"] !== undefined,
+    },
+    storage: verboseChecks(options, deps).filter((item) => item.name.includes("storage")),
+  };
+}
+
 export function formatDoctorReport(report: DoctorReport): string {
   const lines = ["agent-inspector doctor", ""];
   for (const item of report.checks) {
@@ -593,17 +688,22 @@ export function formatDoctorJson(report: DoctorReport): string {
   return `${JSON.stringify(report, null, 2)}\n`;
 }
 
+export function formatDoctorSupportBundle(bundle: DoctorSupportBundle): string {
+  return `${JSON.stringify(bundle, null, 2)}\n`;
+}
+
 export function doctorHelp(): string {
   return [
     "agent-inspector doctor",
     "",
     "Usage:",
-    "  agent-inspector doctor [--port <port>] [--config-dir <dir>] [--providers <json>] [--fix] [--json] [--verbose] [--chrome-extension]",
+    "  agent-inspector doctor [--port <port>] [--config-dir <dir>] [--providers <json>] [--fix] [--json] [--support-bundle] [--verbose] [--chrome-extension]",
     "",
     "Checks local backend health, provider config presence, and package metadata.",
     "The backend check probes the local health endpoint and does not require a composed Web UI.",
     "Pass --fix to run safe local repairs before checks, including legacy data-dir migration.",
     "Pass --json to emit a machine-readable report for CI, scripts, and Jenkins.",
+    "Pass --support-bundle to emit a redacted JSON bundle with readiness causes and storage summary.",
     "Pass --verbose to include local paths, capture mode, and log storage checks.",
     "Pass --chrome-extension to also check Chrome companion source and packaged artifacts.",
     "",
@@ -629,6 +729,31 @@ async function fetchHealth(port: number, basePath: string): Promise<HealthProbe>
   }
 }
 
+async function fetchReadiness(port: number, basePath: string): Promise<ReadinessProbe> {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), PROBE_TIMEOUT_MS);
+  try {
+    const response = await fetch(
+      appendBasePathToOrigin(`http://127.0.0.1:${port}`, "/readyz", basePath),
+      {
+        cache: "no-store",
+        signal: controller.signal,
+      },
+    );
+    let body: unknown = null;
+    try {
+      body = await response.json();
+    } catch {
+      body = null;
+    }
+    return { ok: response.ok, status: response.status, body };
+  } catch {
+    return { ok: false, status: null, body: null };
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
 function isPortOpen(port: number): Promise<boolean> {
   return new Promise((resolveOpen) => {
     const socket = createConnection({ host: "127.0.0.1", port });
@@ -680,6 +805,7 @@ export function createDoctorDeps(): DoctorDeps {
     listDir,
     stat,
     fetchHealth,
+    fetchReadiness,
     isPortOpen,
   };
 }
@@ -698,6 +824,13 @@ export async function runDoctor(argv: readonly string[]): Promise<number> {
     migrateLegacyDataDirs();
   }
   const report = await buildDoctorReport(parsed.options);
-  process.stdout.write(parsed.options.json ? formatDoctorJson(report) : formatDoctorReport(report));
+  if (parsed.options.supportBundle) {
+    const bundle = buildDoctorSupportBundle(parsed.options, createDoctorDeps(), report);
+    process.stdout.write(formatDoctorSupportBundle(bundle));
+  } else {
+    process.stdout.write(
+      parsed.options.json ? formatDoctorJson(report) : formatDoctorReport(report),
+    );
+  }
   return report.exitCode;
 }

package/src/cli.ts

@@ -1137,18 +1137,21 @@ async function runStart(args: string[]): Promise<void> {
   const backgroundSupervisorLogs = runningInBackgroundSupervisor
     ? createBackgroundSupervisorLogs(serverEnv)
     : null;
+  const shouldPipeBackgroundRuntimeLogs = backgroundSupervisorLogs !== null;
   const serverProcess = spawn(serverCommand.command, serverCommand.args, {
     stdio:
       managedLaunch === null
-        ? background
+        ? background && !shouldPipeBackgroundRuntimeLogs
           ? ["ignore", "ignore", "ignore"]
           : ["ignore", "pipe", "pipe"]
         : backend === "typescript"
-          ? background
+          ? background && !shouldPipeBackgroundRuntimeLogs
             ? ["ignore", "ignore", "ignore", "ipc"]
             : ["ignore", "pipe", "pipe", "ipc"]
           : background
-            ? ["ignore", "ignore", "ignore"]
+            ? shouldPipeBackgroundRuntimeLogs
+              ? ["ignore", "pipe", "pipe"]
+              : ["ignore", "ignore", "ignore"]
             : ["ignore", "pipe", "pipe"],
     detached: background,
     env: serverEnv,
@@ -1158,7 +1161,7 @@ async function runStart(args: string[]): Promise<void> {
     console.error(`Failed to start Agent Inspector runtime: ${err.message}`);
   });
   const serverExit = waitForProcessExit(serverProcess);
-  if (!background) {
+  if (!background || backgroundSupervisorLogs !== null) {
     const outputContext = {
       enableIdentityProxy,
       publicPort: port,

package/src/components/ProxyViewerContainer.tsx

@@ -18,7 +18,9 @@ import {
 import type { SessionLoadProgress } from "./proxy-viewer/SessionLoadProgressBar";
 import { browserPrefersReducedMotion, preferredScrollBehavior } from "./proxy-viewer/accessibility";
 import {
+  buildLogIndexById,
   filterLogs,
+  mergeLogsIncrementally,
   mergeLogsById,
   mergeSessionIds,
 } from "./proxy-viewer/proxyViewerContainerLogic";
@@ -133,6 +135,7 @@ const SESSION_LOGS_FETCH_TIMEOUT_MS = 20_000;
 const SESSION_MEMBERSHIP_FETCH_TIMEOUT_MS = 10_000;
 const SSE_RECONNECT_DELAY_MS = 3_000;
 const SSE_STALE_AFTER_MS = 10_000;
+const LIVE_RECENT_LOG_LIMIT = 2_000;
 
 function buildSessionLogsPageUrl(
   sessionId: string,
@@ -163,15 +166,6 @@ function buildSessionLogsPageUrl(
   return `/api/logs?${params.toString()}`;
 }
 
-function buildLogIndex(logs: readonly CapturedLog[]): Map<number, number> {
-  const idx = new Map<number, number>();
-  for (let i = 0; i < logs.length; i++) {
-    const log = logs[i];
-    if (log !== undefined) idx.set(log.id, i);
-  }
-  return idx;
-}
-
 function fetchSessionLogsPage(
   sessionId: string,
   request: SessionPageRequest,
@@ -275,6 +269,14 @@ export function ProxyViewerContainer({
   // Debounce buffer for SSE updates
   const pendingUpdatesRef = useRef<CapturedLog[]>([]);
   const flushTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const logMergeOptions = useCallback(
+    () => ({
+      recentLimit: LIVE_RECENT_LOG_LIMIT,
+      retainSessionId:
+        initialSessionId ?? (selectedSession === "__all__" ? undefined : selectedSession),
+    }),
+    [initialSessionId, selectedSession],
+  );
   const showErrorToast = useCallback(
     (message: string) => {
       showToast({ message, tone: "error" });
@@ -359,12 +361,17 @@ export function ProxyViewerContainer({
 
     startLogTransition(() => {
       setAllLogs((prev) => {
-        const next = mergeLogsById(prev, updates);
-        logIndexRef.current = buildLogIndex(next);
-        return next;
+        const merged = mergeLogsIncrementally(
+          prev,
+          logIndexRef.current,
+          updates,
+          logMergeOptions(),
+        );
+        logIndexRef.current = merged.index;
+        return merged.logs;
       });
     });
-  }, [startLogTransition]);
+  }, [logMergeOptions, startLogTransition]);
 
   const scheduleUpdate = useCallback(
     (log: CapturedLog) => {
@@ -425,9 +432,14 @@ export function ProxyViewerContainer({
           pendingUpdatesRef.current = [];
 
           setAllLogs((prev) => {
-            const nextLogs = mergeLogsById(prev, update.logs);
-            logIndexRef.current = buildLogIndex(nextLogs);
-            return nextLogs;
+            const merged = mergeLogsIncrementally(
+              prev,
+              logIndexRef.current,
+              update.logs,
+              logMergeOptions(),
+            );
+            logIndexRef.current = merged.index;
+            return merged.logs;
           });
           setKnownSessions((prev) => mergeSessionIds(prev, extractSessions(update.logs)));
           if (staleTimeoutRef.current !== null) {
@@ -523,7 +535,7 @@ export function ProxyViewerContainer({
         .then((page) => {
           if (sessionPageRequestIdRef.current !== requestId) return;
           const nextLogs = page.logs;
-          logIndexRef.current = buildLogIndex(nextLogs);
+          logIndexRef.current = buildLogIndexById(nextLogs);
           setAllLogs(nextLogs);
           setLogPage(page);
           setSelectedSession(initialSessionId);
@@ -592,9 +604,14 @@ export function ProxyViewerContainer({
 
         if (sessionPageRequestIdRef.current !== requestId) return;
         setAllLogs((prev) => {
-          const next = mergeLogsById(prev, collected);
-          logIndexRef.current = buildLogIndex(next);
-          return next;
+          const merged = mergeLogsIncrementally(
+            prev,
+            logIndexRef.current,
+            collected,
+            logMergeOptions(),
+          );
+          logIndexRef.current = merged.index;
+          return merged.logs;
         });
         setKnownSessions((prev) => mergeSessionIds(prev, [sessionId]));
         setSessionPageLoading(false);
@@ -796,7 +813,7 @@ export function ProxyViewerContainer({
         const removed = prev.filter((log) => idSet.has(log.id));
         const remaining = prev.filter((log) => !idSet.has(log.id));
         setKnownSessions((known) => mergeSessionIds(known, extractSessions(removed)));
-        logIndexRef.current = buildLogIndex(remaining);
+        logIndexRef.current = buildLogIndexById(remaining);
         return remaining;
       });
       showToast({ message: "Cleared this group from the current view.", tone: "success" });
@@ -856,7 +873,7 @@ export function ProxyViewerContainer({
         if (sessionPageRequestIdRef.current !== deleteRequestId) return;
         setAllLogs((prev) => {
           const remaining = prev.filter((log) => log.sessionId !== sessionId);
-          logIndexRef.current = buildLogIndex(remaining);
+          logIndexRef.current = buildLogIndexById(remaining);
           return remaining;
         });
         setLogPage((prev) =>
@@ -886,7 +903,7 @@ export function ProxyViewerContainer({
       if (sessionPageRequestIdRef.current !== deleteRequestId) return;
       setAllLogs((prev) => {
         const remaining = prev.filter((log) => log.sessionId !== sessionId);
-        logIndexRef.current = buildLogIndex(remaining);
+        logIndexRef.current = buildLogIndexById(remaining);
         return remaining;
       });
       setLogPage((prev) =>
@@ -949,7 +966,7 @@ export function ProxyViewerContainer({
           prev.filter((log) => !importedIds.has(log.id)),
           result.logs,
         );
-        logIndexRef.current = buildLogIndex(next);
+        logIndexRef.current = buildLogIndexById(next);
         return next;
       });
       setSelectedSession(result.sessionId);