cartethyia 2.7.4 → 2.7.5

package/src/console/cli-tools/injectors/opencode.ts

@@ -1,153 +1,153 @@
-import type {} from "../contracts";
-import { ensureV1Suffix, homeDir, join, readJsonFile, writeJsonFile } from "../fs-ops";
-import type { InjectorSpec } from "../contracts";
-
-
-// OpenCode injector spec.
-interface OpencodeModel {
-  name: string;
-  modalities: { input: string[]; output: string[] };
-}
-
-interface OpencodeProvider {
-  npm: string;
-  options: { baseURL?: string; apiKey?: string };
-  models: Record<string, OpencodeModel>;
-}
-
-interface OpencodeConfig {
-  provider?: Record<string, OpencodeProvider>;
-  model?: string;
-  agent?: {
-    explorer?: {
-      description?: string;
-      mode?: string;
-      model?: string;
-    };
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
-
-function buildOpencodeModels(models: readonly string[]): Record<string, OpencodeModel> {
-  const map: Record<string, OpencodeModel> = {};
-  for (const m of models) {
-    if (!m) continue;
-    map[m] = { name: m, modalities: { input: ["text", "image"], output: ["text"] } };
-  }
-  return map;
-}
-
-export const opencodeSpec: InjectorSpec = {
-  toolId: "opencode",
-  displayName: "OpenCode",
-  binary: "opencode",
-  resolvePath: () => join(homeDir(), ".config", "opencode", "opencode.json"),
-  resolveDir: () => join(homeDir(), ".config", "opencode"),
-
-  async readStatus(path) {
-    const config = (await readJsonFile(path)) as OpencodeConfig | null;
-    if (!config) {
-      return { configured: false, currentEndpoint: null, rawApiKey: null, currentModels: null };
-    }
-    const provider = config.provider?.cartethyia;
-    const endpoint = provider?.options?.baseURL ?? null;
-    const models = provider?.models ? Object.keys(provider.models) : null;
-    const active =
-      typeof config.model === "string" && config.model.startsWith("cartethyia/")
-        ? config.model.split("/").slice(1).join("/")
-        : null;
-    return {
-      configured: !!provider,
-      currentEndpoint: endpoint,
-      rawApiKey: provider?.options?.apiKey ?? null,
-      currentModels: active && models ? [active, ...models.filter((m) => m !== active)] : models,
-    };
-  },
-
-  async apply(input, path) {
-    const existing = (await readJsonFile(path)) as OpencodeConfig | null;
-    const config: OpencodeConfig = (existing ?? {}) as OpencodeConfig;
-
-    if (!config.provider) config.provider = {};
-    const prior = config.provider.cartethyia;
-    config.provider.cartethyia = {
-      npm: "@ai-sdk/openai-compatible",
-      options: {
-        ...(prior?.options ?? {}),
-        baseURL: ensureV1Suffix(input.endpoint),
-        apiKey: input.apiKey,
-      },
-      models: { ...(prior?.models ?? {}), ...buildOpencodeModels(input.modelIds) },
-    };
-
-    const activeModel = input.activeModel ?? input.modelIds[0] ?? "";
-    config.model = activeModel === "" ? "" : `cartethyia/${activeModel}`;
-
-    if (!config.agent) config.agent = {};
-    const subagentModel = input.subagentModel ?? input.modelIds[0] ?? activeModel;
-    config.agent.explorer = {
-      description: "Fast explorer subagent",
-      mode: "subagent",
-      model: `cartethyia/${subagentModel}`,
-    };
-
-    await writeJsonFile(path, config);
-  },
-
-  async reset(path) {
-    const config = (await readJsonFile(path)) as OpencodeConfig | null;
-    if (!config) return false;
-
-    if (config.provider) {
-      delete config.provider.cartethyia;
-      if (Object.keys(config.provider).length === 0) delete config.provider;
-    }
-
-    if (typeof config.model === "string" && config.model.startsWith("cartethyia/")) {
-      delete config.model;
-    }
-
-    if (config.agent?.explorer?.model?.startsWith("cartethyia/")) {
-      delete config.agent.explorer;
-      if (Object.keys(config.agent).length === 0) delete config.agent;
-    }
-
-    await writeJsonFile(path, config);
-  },
-
-  download(input) {
-    const activeModel = input.activeModel ?? input.modelIds[0] ?? "";
-    const subagentModel = input.subagentModel ?? input.modelIds[0] ?? activeModel;
-    const config: OpencodeConfig = {
-      provider: {
-        cartethyia: {
-          npm: "@ai-sdk/openai-compatible",
-          options: {
-            baseURL: ensureV1Suffix(input.endpoint),
-            apiKey: input.apiKey,
-          },
-          models: buildOpencodeModels(input.modelIds),
-        },
-      },
-      model: activeModel === "" ? "" : `cartethyia/${activeModel}`,
-      agent: {
-        explorer: {
-          description: "Fast explorer subagent",
-          mode: "subagent",
-          model: `cartethyia/${subagentModel}`,
-        },
-      },
-    };
-    return {
-      content: JSON.stringify(config, null, 2),
-      filename: "opencode.json",
-      mimeType: "application/json",
-    };
-  },
-
-  messages: {
-    applied: "OpenCode settings applied",
-    reset: "Cartethyia settings removed from OpenCode",
-  },
-};
+import type {} from "../contracts";
+import { ensureV1Suffix, homeDir, join, readJsonFile, writeJsonFile } from "../fs-ops";
+import type { InjectorSpec } from "../contracts";
+
+
+// OpenCode injector spec.
+interface OpencodeModel {
+  name: string;
+  modalities: { input: string[]; output: string[] };
+}
+
+interface OpencodeProvider {
+  npm: string;
+  options: { baseURL?: string; apiKey?: string };
+  models: Record<string, OpencodeModel>;
+}
+
+interface OpencodeConfig {
+  provider?: Record<string, OpencodeProvider>;
+  model?: string;
+  agent?: {
+    explorer?: {
+      description?: string;
+      mode?: string;
+      model?: string;
+    };
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
+
+function buildOpencodeModels(models: readonly string[]): Record<string, OpencodeModel> {
+  const map: Record<string, OpencodeModel> = {};
+  for (const m of models) {
+    if (!m) continue;
+    map[m] = { name: m, modalities: { input: ["text", "image"], output: ["text"] } };
+  }
+  return map;
+}
+
+export const opencodeSpec: InjectorSpec = {
+  toolId: "opencode",
+  displayName: "OpenCode",
+  binary: "opencode",
+  resolvePath: () => join(homeDir(), ".config", "opencode", "opencode.json"),
+  resolveDir: () => join(homeDir(), ".config", "opencode"),
+
+  async readStatus(path) {
+    const config = (await readJsonFile(path)) as OpencodeConfig | null;
+    if (!config) {
+      return { configured: false, currentEndpoint: null, rawApiKey: null, currentModels: null };
+    }
+    const provider = config.provider?.cartethyia;
+    const endpoint = provider?.options?.baseURL ?? null;
+    const models = provider?.models ? Object.keys(provider.models) : null;
+    const active =
+      typeof config.model === "string" && config.model.startsWith("cartethyia/")
+        ? config.model.split("/").slice(1).join("/")
+        : null;
+    return {
+      configured: !!provider,
+      currentEndpoint: endpoint,
+      rawApiKey: provider?.options?.apiKey ?? null,
+      currentModels: active && models ? [active, ...models.filter((m) => m !== active)] : models,
+    };
+  },
+
+  async apply(input, path) {
+    const existing = (await readJsonFile(path)) as OpencodeConfig | null;
+    const config: OpencodeConfig = (existing ?? {}) as OpencodeConfig;
+
+    if (!config.provider) config.provider = {};
+    const prior = config.provider.cartethyia;
+    config.provider.cartethyia = {
+      npm: "@ai-sdk/openai-compatible",
+      options: {
+        ...(prior?.options ?? {}),
+        baseURL: ensureV1Suffix(input.endpoint),
+        apiKey: input.apiKey,
+      },
+      models: { ...(prior?.models ?? {}), ...buildOpencodeModels(input.modelIds) },
+    };
+
+    const activeModel = input.activeModel ?? input.modelIds[0] ?? "";
+    config.model = activeModel === "" ? "" : `cartethyia/${activeModel}`;
+
+    if (!config.agent) config.agent = {};
+    const subagentModel = input.subagentModel ?? input.modelIds[0] ?? activeModel;
+    config.agent.explorer = {
+      description: "Fast explorer subagent",
+      mode: "subagent",
+      model: `cartethyia/${subagentModel}`,
+    };
+
+    await writeJsonFile(path, config);
+  },
+
+  async reset(path) {
+    const config = (await readJsonFile(path)) as OpencodeConfig | null;
+    if (!config) return false;
+
+    if (config.provider) {
+      delete config.provider.cartethyia;
+      if (Object.keys(config.provider).length === 0) delete config.provider;
+    }
+
+    if (typeof config.model === "string" && config.model.startsWith("cartethyia/")) {
+      delete config.model;
+    }
+
+    if (config.agent?.explorer?.model?.startsWith("cartethyia/")) {
+      delete config.agent.explorer;
+      if (Object.keys(config.agent).length === 0) delete config.agent;
+    }
+
+    await writeJsonFile(path, config);
+  },
+
+  download(input) {
+    const activeModel = input.activeModel ?? input.modelIds[0] ?? "";
+    const subagentModel = input.subagentModel ?? input.modelIds[0] ?? activeModel;
+    const config: OpencodeConfig = {
+      provider: {
+        cartethyia: {
+          npm: "@ai-sdk/openai-compatible",
+          options: {
+            baseURL: ensureV1Suffix(input.endpoint),
+            apiKey: input.apiKey,
+          },
+          models: buildOpencodeModels(input.modelIds),
+        },
+      },
+      model: activeModel === "" ? "" : `cartethyia/${activeModel}`,
+      agent: {
+        explorer: {
+          description: "Fast explorer subagent",
+          mode: "subagent",
+          model: `cartethyia/${subagentModel}`,
+        },
+      },
+    };
+    return {
+      content: JSON.stringify(config, null, 2),
+      filename: "opencode.json",
+      mimeType: "application/json",
+    };
+  },
+
+  messages: {
+    applied: "OpenCode settings applied",
+    reset: "Cartethyia settings removed from OpenCode",
+  },
+};

package/src/console/cli-tools/routes.ts

@@ -23,7 +23,7 @@ import type { ApplyInput, CliMappingInput, CliModelMapping } from "./contracts";
  * `download` and `apply` require `keyId`; the server resolves the recoverable
  * AES-256-GCM copy so the operator never pastes a raw secret.
  */
-export interface CliToolsRoutesConfig {
+interface CliToolsRoutesConfig {
   readonly service: CliToolService;
   readonly accessResolver: ConsoleAccessResolver;
   readonly auditSink?: AuditSink;

package/src/console/cli-tools/service.ts

@@ -27,7 +27,7 @@ import { ConsoleDomainError } from "../shared/errors";
  * and share one process's home directory (they are not tenant-scoped).
  */
 
-export function toToolRegistryEntry(def: ToolDef): ToolRegistryEntry {
+function toToolRegistryEntry(def: ToolDef): ToolRegistryEntry {
   return {
     id: def.id,
     name: def.name,

package/src/console/cli-tools/store.ts

@@ -14,13 +14,13 @@ import type {
  * The API-layer service owns validation against the registry; this store
  * only serializes rows in and out of Postgres.
  */
-export interface StoredMappingRow extends CliModelMapping {
+interface StoredMappingRow extends CliModelMapping {
   readonly toolId: string;
   readonly tenantId: string;
   readonly apiKeyId: string;
 }
 
-export interface StoredSettings {
+interface StoredSettings {
   readonly tenantId: string;
   readonly toolId: string;
   readonly apiKeyId: string;

package/src/console/console-router.ts

@@ -36,6 +36,7 @@ import type { BundledProviderCatalog } from "../providers/operations/provider-ca
 import type { ValidatedNetworkBindingFactory } from "../network/pool/resolver";
 import type { TrustedProxyBoundary } from "../config/network";
 import { gzipResponse } from "./response-compression";
+import { beginConsoleActivity } from "../shared/invoke-guard";
 
 export interface ConsoleApiCompositionDeps {
   readonly db: CartethyiaDatabase;
@@ -80,6 +81,15 @@ export interface ConsoleApiCompositionDeps {
     | undefined;
   readonly resolvePeerAddress?: (request: Request) => string | null;
   readonly trustedProxyBoundary?: TrustedProxyBoundary;
+  /**
+   * The process shutdown coordinator, narrowed to the surface the update apply
+   * route needs. Declared structural (not the class) so the console composition
+   * root does not import the boot layer; `ShutdownCoordinator` satisfies it.
+   */
+  readonly shutdownCoordinator?: {
+    readonly begin: (reason: "update") => Promise<void>;
+    readonly totalShutdownBudgetMs: () => number;
+  };
 }
 /**
  * Extracts a bearer API key from a console request, or `undefined`.
@@ -109,6 +119,12 @@ export function createConsoleRouter(deps: ConsoleApiCompositionDeps): AnyElysia
    * process (tests, or a second app instance) never share decisions.
    */
   const sessionAccessCache = new WeakMap<Request, AccessDecision | null>();
+  /**
+   * G-03 InvokeGuard: the console control plane's foreground-activity count.
+   * `beforeHandle` bumps it for the request; `afterResponse` releases it. The
+   * end callback is keyed by request so parallel requests pair correctly.
+   */
+  const consoleActivityEnds = new WeakMap<Request, () => void>();
   const cookiePolicy = defaultSessionCookiePolicy;
   const credentialService = new ConsoleCredentialService();
   const sessionService = new ConsoleSessionService(db, cookiePolicy);
@@ -137,6 +153,12 @@ export function createConsoleRouter(deps: ConsoleApiCompositionDeps): AnyElysia
     .use(createConsoleCsrfMiddleware())
     .use(createConsoleMutationLimiterMiddleware())
     .beforeHandle(async ({ request }: { request: Request }) => {
+      // G-03: count this console request as foreground activity for the
+      // duration of its handling. Released in `afterResponse` below (or by
+      // the catch-all in the error path, which also runs before the response
+      // leaves). The scheduled worker registry uses this to defer sweeps
+      // while the operator is actively using the console.
+      consoleActivityEnds.set(request, beginConsoleActivity());
       // The auth routes (`/console/api/auth/*`) resolve the session themselves
       // and never read `accessResolver`, so resolving here too would repeat the
       // session lookup plus its user query on every login/session/logout call
@@ -167,6 +189,15 @@ export function createConsoleRouter(deps: ConsoleApiCompositionDeps): AnyElysia
         }),
       );
     })
+    .afterResponse(({ request }: { request: Request }) => {
+      // G-03: release the foreground-activity count for this request.
+      // Elysia runs `afterResponse` for every completed request, errored ones
+      // included (the error is converted to a response first), so this is the
+      // single reliable release point — a failing route can never leak an
+      // elevated foreground count (which would defer sweeps forever).
+      consoleActivityEnds.get(request)?.();
+      consoleActivityEnds.delete(request);
+    })
     .use(
       createConsoleAuthRoutes(
         db,
@@ -197,6 +228,7 @@ export function createConsoleRouter(deps: ConsoleApiCompositionDeps): AnyElysia
     admissionService: deps.admissionService,
     readRoutingAccountInflight: deps.readRoutingAccountInflight,
     ...(deps.flushBuffers ? { flushBuffers: deps.flushBuffers } : {}),
+    ...(deps.shutdownCoordinator ? { shutdownCoordinator: deps.shutdownCoordinator } : {}),
     credentialService,
     // The backup surface re-authenticates the operator, so it needs the current
     // user's hash. Read from the session on the request that asks for it, never

package/src/console/dashboard-assets.ts

@@ -9,7 +9,7 @@ import { acceptsGzip } from "./response-compression";
 /**
  * Represents the result of serving a static file.
  */
-export interface StaticServeResult {
+interface StaticServeResult {
   status: number;
   body: Uint8Array | undefined;
   headers: Record<string, string>;
@@ -18,7 +18,7 @@ export interface StaticServeResult {
 /**
  * Configuration for the static file handler.
  */
-export interface StaticHandlerConfig {
+interface StaticHandlerConfig {
   /** Absolute path to the dashboard build directory */
   buildDir: string;
   /**
@@ -30,7 +30,7 @@ export interface StaticHandlerConfig {
 }
 
 /** Shared landing, console, and public share entry document produced by Vite. */
-export const DEFAULT_ENTRY_DOCUMENTS: Readonly<Record<string, string>> = {
+const DEFAULT_ENTRY_DOCUMENTS: Readonly<Record<string, string>> = {
   "/": "index.html",
   "/share": "index.html",
   "/console": "index.html",
@@ -47,7 +47,7 @@ function dashboardBuildHeader(html: string): Record<string, string> {
  * their own card here — crawlers do not run the client bundle, so a
  * `document.title` set at runtime cannot reach them.
  */
-export interface SocialMeta {
+interface SocialMeta {
   title: string;
   description: string;
   image: string;
@@ -62,11 +62,11 @@ export const SHARE_SOCIAL_META: SocialMeta = {
   title: "Cartethyia — Bansos Token",
   description:
     "Come and save your tokens 💖 Shared Cartethyia API key — Bansos Token with live quota, usage and model allowlist.",
-  image: "/assets/brand/og_bansos.webp",
-  imageType: "image/webp",
-  // Read from the file's own VP8 header, not carried over from the JPEG this
-  // replaced: og:image:width/height are what a crawler uses to allocate the
-  // card before the bytes arrive, so a copied size makes every preview crop.
+  image: "/assets/brand/og_bansos.jpg",
+  imageType: "image/jpeg",
+  // Read from the file's own header, not carried over from a previous image:
+  // og:image:width/height are what a crawler uses to allocate the card before
+  // the bytes arrive, so a copied size makes every preview crop.
   imageWidth: 1760,
   imageHeight: 576,
   imageAlt: "Cartethyia Bansos Token — Come and save your tokens",

package/src/console/domain-registration.ts

@@ -124,6 +124,16 @@ export interface ConsoleDomainContext {
   readonly loadConsoleUser: (request: Request) => Promise<{ readonly passwordHash: string } | null>;
   /** Password verification against the console user's stored hash. */
   readonly credentialService: Pick<ConsoleCredentialService, "verifyPassword">;
+  /**
+   * The process shutdown coordinator, narrowed to the update apply route's
+   * drain surface. Optional because reduced compositions (tests) legitimately
+   * build a console that cannot apply updates; the apply route answers 503
+   * rather than exiting undrained when it is absent.
+   */
+  readonly shutdownCoordinator?: {
+    readonly begin: (reason: "update") => Promise<void>;
+    readonly totalShutdownBudgetMs: () => number;
+  };
 }
 import { and, eq, isNull, or } from "drizzle-orm";
 import { networkPools, providerRoutingSettings } from "../persistence/schema";
@@ -252,6 +262,9 @@ export function registerConsoleDomains(
   console.use(createUpdateRoutes({
     accessResolver: ctx.accessResolver,
     observabilityStore,
+    ...(ctx.shutdownCoordinator === undefined
+      ? {}
+      : { shutdownCoordinator: ctx.shutdownCoordinator }),
   }));
   console.use(createRemoteSupportRoutes({
     accessResolver: ctx.accessResolver,
@@ -271,6 +284,7 @@ export function registerConsoleDomains(
     accessResolver: ctx.accessResolver,
     auditSink: ctx.auditRecorder,
     providerRegistry: ctx.providerRegistry,
+    redis: ctx.redis,
     snapshotInvalidator: ctx.routeSnapshotService,
     resolveExportCredentials,
     // Without this, a custom provider only becomes dispatchable after a
@@ -384,8 +398,8 @@ export function registerConsoleDomains(
   // it is released when the last of those flows settles.
   const oauthCallbackListener = new OAuthCallbackListener({
     completer: {
-      complete: (providerId, code, state) =>
-        completeLogin(oauthConfig, providerId, code, state),
+      complete: (providerId, code, state, callbackParams) =>
+        completeLogin(oauthConfig, providerId, code, state, callbackParams),
     },
   });
   const oauthConfig: OAuthLoginConfig = {

package/src/console/inferhub/client.ts

@@ -54,13 +54,6 @@ export interface InferhubClientOptions {
   readonly now?: () => number;
 }
 
-export class InferhubRateLimited extends Error {
-  constructor() {
-    super("inferhub management rate limit reached");
-    this.name = "InferhubRateLimited";
-  }
-}
-
 /**
  * One management GET.
  *

package/src/console/inferhub/key-store.ts

@@ -20,7 +20,7 @@ import { decryptCredentialToString, encryptCredential, hashSecret } from "../../
 import type { CartethyiaDatabase } from "../../persistence/db-handle";
 
 /** Shape returned to the console: whether a key is set, and never the key. */
-export interface InferhubKeyStatus {
+interface InferhubKeyStatus {
   readonly configured: boolean;
   /** Last four characters, so an operator can tell two keys apart. */
   readonly last4: string | null;

package/src/console/inferhub/normalize.ts

@@ -26,7 +26,7 @@ import type {
 /** Ask buckets are keyed to this many decimals so float noise cannot split one price into two tiers. */
 const PRICE_PRECISION = 6;
 /** Default number of live providers a capacity-weighted price must have behind it. */
-export const DEFAULT_MIN_CAPACITY = 2;
+const DEFAULT_MIN_CAPACITY = 2;
 
 const FAMILY_STATES: readonly FamilyState[] = [
   "operational",
@@ -114,7 +114,7 @@ export function groupTiers(
  * provider count would make `providersLive` wrong, and a wrong availability
  * number is worse than an absent one.
  */
-export function pricePointsToTiers(
+function pricePointsToTiers(
   points: unknown,
   official: number | null,
 ): readonly Tier[] {

package/src/console/inferhub/routes.ts

@@ -57,7 +57,7 @@ import type {
 /** Success rate below which a model is not routed to, when one is reported. */
 const MIN_SUCCESS_RATE_PCT = 80;
 
-export interface InferhubRoutesConfig {
+interface InferhubRoutesConfig {
   readonly accessResolver: (request: Request) => AccessDecision | undefined;
   /** Resolves the `config_read` key. Absent means the catalog cannot be read. */
   readonly resolveConfigKey?: () => Promise<string | undefined> | string | undefined;

package/src/console/inferhub/types.ts

@@ -34,7 +34,7 @@ export interface ModelHealth {
   readonly familyState: FamilyState | null;
 }
 
-export interface ModelCapabilities {
+interface ModelCapabilities {
   readonly contextWindow: number | null;
   readonly maxOutputTokens: number | null;
   readonly modalities: readonly string[];

package/src/console/observability/contracts.ts

@@ -173,7 +173,7 @@ export interface UsageCacheResponse {
   cacheWriteTokens: number;
   hitRate: number;
 }
-export type UsageRequestMode = "stream" | "non_stream";
+type UsageRequestMode = "stream" | "non_stream";
 export interface UsageRequestItem {
   requestId: string;
   surface?: string;

package/src/console/observability/live.ts

@@ -34,7 +34,7 @@ import { poolByteSnapshot } from "../../network/pool/byte-accounting";
 import { consoleSseResponse, createConsoleSseStream } from "./sse";
 import { subscribeRequestCompleted } from "../../observability/request-notify";
 
-export interface LiveConfig {
+interface LiveConfig {
   readonly accessResolver: ConsoleAccessResolver;
   readonly poolSelector?: NetworkPoolSelector;
   readonly db?: CartethyiaDatabase;
@@ -94,10 +94,9 @@ export function createLiveRoutes(config: LiveConfig): AnyElysia {
         requireScope(access, "dashboard:read");
         const tenantId = access?.tenantId;
         if (!tenantId) return errorResponse(new Error("Tenant required"), set, "Live operation failed");
-        set.headers["content-type"] = "text/event-stream";
-        set.headers["cache-control"] = "no-cache, no-transform";
-        set.headers["connection"] = "keep-alive";
-        set.headers["x-accel-buffering"] = "no";
+        // No `set.headers` writes here: this handler returns a `Response`, so
+        // Elysia discards `set` and `consoleSseResponse` below owns the SSE
+        // headers (content-type, cache-control, connection, buffering).
         return consoleSseResponse(
           createConsoleSseStream(request.signal, ({ send }) => {
             return subscribeRequestCompleted((notice) => {
@@ -119,22 +118,36 @@ export function createLiveRoutes(config: LiveConfig): AnyElysia {
     })
     .get("/live/in-flight/stream", ({ request, set }) => {
       try {
-        requireScope(config.accessResolver(request), "dashboard:read");
+        const access = requireScope(config.accessResolver(request), "dashboard:read");
+        const tenantId = access?.tenantId;
+        return consoleSseResponse(
+          createConsoleSseStream(request.signal, ({ send }) => {
+            const store = config.stateStore;
+            if (!store) {
+              send("count", EMPTY_IN_FLIGHT);
+              return () => {};
+            }
+            // The Usage page keeps one stream open for both the in-flight gauge
+            // and request-table invalidation, so this route also fans out
+            // `request_completed` events (tagged by kind) for the tenant,
+            // mirroring `/live/requests/stream`.
+            const unsubscribe = store.subscribeInFlight((snapshot) => send("count", snapshot));
+            let unsubscribeCompleted: (() => void) | undefined;
+            if (tenantId) {
+              unsubscribeCompleted = subscribeRequestCompleted((notice) => {
+                if (notice.tenantId === tenantId) send("request_completed", notice);
+              });
+            }
+            send("count", store.inFlightSnapshot());
+            return () => {
+              unsubscribe();
+              unsubscribeCompleted?.();
+            };
+          }),
+        );
       } catch (e) {
         return errorResponse(e, set, "Live operation failed");
       }
-      return consoleSseResponse(
-        createConsoleSseStream(request.signal, ({ send }) => {
-          const store = config.stateStore;
-          if (!store) {
-            send("count", EMPTY_IN_FLIGHT);
-            return () => {};
-          }
-          const unsubscribe = store.subscribeInFlight((snapshot) => send("count", snapshot));
-          send("count", store.inFlightSnapshot());
-          return unsubscribe;
-        }),
-      );
     })
     .get("/live/pools", async ({ request, set }) => {
       try {