diff --git a/apps/web/e2e/data/admin.mjs b/apps/web/e2e/data/admin.mjs
index 058d35875..3d4265b08 100644
--- a/apps/web/e2e/data/admin.mjs
+++ b/apps/web/e2e/data/admin.mjs
@@ -44,7 +44,7 @@ export function buildAdmin(now, base, resources) {
     vaults: resources.vaults.filter(of("vault", projectId)),
   });
 
-  const keyRef = (project, k) => ({ id: k.id, name: k.name, prefix: k.prefix, kind: "issued", revoked_at: k.revoked_at ? iso(k.revoked_at) : null });
+  const keyRef = (k) => ({ id: k.id, name: k.name, prefix: k.prefix, kind: "issued", revoked_at: k.revoked_at ? iso(k.revoked_at) : null });
   // Deterministic creator per resource: rotate through the project's keys; one in seven is unknown.
   const creators = new Map();
   let turn = 0;
@@ -52,7 +52,7 @@ export function buildAdmin(now, base, resources) {
     const cacheKey = `${type}:${id}`;
     if (!creators.has(cacheKey)) {
       turn += 1;
-      creators.set(cacheKey, turn % 7 === 0 ? null : keyRef(project, project.keys[turn % project.keys.length]));
+      creators.set(cacheKey, turn % 7 === 0 ? null : keyRef(project.keys[turn % project.keys.length]));
     }
     return creators.get(cacheKey);
   };
@@ -61,7 +61,7 @@ export function buildAdmin(now, base, resources) {
     const own = collections(project.id);
     const list = [];
     const push = (at, action, type, id, parent = "", creatorType = type) => {
-      const creator = action === "create" ? creatorFor(project, creatorType, id) : keyRef(project, project.keys[list.length % project.keys.length]);
+      const creator = action === "create" ? creatorFor(project, creatorType, id) : keyRef(project.keys[list.length % project.keys.length]);
       list.push({ id: `op_${project.id.slice(5)}_${list.length}`, created_at: iso(at), api_key: creator, action, resource_type: type, resource_id: id, parent_id: parent, request_id: `req_${list.length}`, trace_id: `${list.length}`.padStart(32, "0") });
     };
     for (const agent of own.agents) { push(agent.created_at, "create", "agent", agent.id); if (agent.updated_at > agent.created_at) push(agent.updated_at, "update", "agent", agent.id); }
diff --git a/apps/web/e2e/data/routes.mjs b/apps/web/e2e/data/routes.mjs
index 535af7a62..c0806d2f8 100644
--- a/apps/web/e2e/data/routes.mjs
+++ b/apps/web/e2e/data/routes.mjs
@@ -15,7 +15,6 @@ function daemonUrl(publicUrl) {
 
 export function buildDemo(now = Math.floor(Date.now() / 1000), publicUrl = "https://core.example.com") {
   seed = 42;
-  const models = ["gpt-5.1-codex", "claude-sonnet-5", "MiniMax-M2", "gpt-5.1-mini"];
   const agents = agentDefinitions.map((definition, index) => ({
     id: `agent_${index + 1}${uuid().slice(0, 6)}`, object: "agent", model: definition.model, name: definition.name, instructions: definition.instructions,
     metadata: definition.metadata, multi_agent: { enabled: false, max_concurrent_subagents: null }, reasoning: definition.reasoning, service_tier: "auto",
diff --git a/apps/web/e2e/fixture-console.mjs b/apps/web/e2e/fixture-console.mjs
index 1f2513802..c5a67bea7 100644
--- a/apps/web/e2e/fixture-console.mjs
+++ b/apps/web/e2e/fixture-console.mjs
@@ -533,7 +533,7 @@ const tokenLimit = (value) => value === undefined || (Number.isInteger(value) &&
 const jsonKind = (value) => Array.isArray(value) ? "an array" : typeof value === "string" ? "a string" : typeof value === "boolean" ? "a boolean" : Number.isInteger(value) ? "an integer" : "a number";
 
 /** The first rule a provider body breaks, in Core's order and words; null when valid. */
-function providerProblem(harness, input) {
+function providerProblem(input) {
   if (Object.keys(input).some((key) => !PROVIDER_FIELDS.has(key)) || ["protocol", "base_url", "api_key"].some((key) => typeof input[key] !== "string") ||
     !tokenLimit(input.context_window) || !tokenLimit(input.max_output_tokens)) return PROVIDER_SHAPE;
   if (!httpsBase(input.base_url)) return "model provider requires an HTTPS base_url without credentials, query or fragment";
@@ -581,7 +581,7 @@ async function harnessRoute(request, response, path) {
   if (typeof input.model !== "string" || !input.model.trim()) return error(response, 400, "A model ID is required.", "model_configuration_model_invalid");
   if (input.harness_config !== undefined && (!input.harness_config || typeof input.harness_config !== "object" || Array.isArray(input.harness_config))) return error(response, 400, "Harness configuration must be an object.", "harness_config_invalid");
   if (!support(harness).protocols.includes(input.model_provider?.protocol)) return error(response, 400, "This harness does not support this protocol.", "model_provider_protocol_unsupported");
-  const problem = providerProblem(harness, input.model_provider ?? {});
+  const problem = providerProblem(input.model_provider ?? {});
   if (problem) return error(response, 400, problem, "invalid_request_error");
   entry.provider = {
     object: "core.model_configuration", harness, model: input.model, harness_config: input.harness_config ?? {},
diff --git a/apps/web/package.json b/apps/web/package.json
index 10e47110a..a2257a27c 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -17,7 +17,6 @@
     "@number-flow/react": "^0.6.2",
     "@oac/agents-client": "workspace:*",
     "@tanstack/react-query": "^5.103.2",
-    "@tanstack/react-table": "^8.21.3",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "i18next": "^26.4.2",
diff --git a/apps/web/pnpm-lock.yaml b/apps/web/pnpm-lock.yaml
index 934f1cf02..d7b40b9b9 100644
--- a/apps/web/pnpm-lock.yaml
+++ b/apps/web/pnpm-lock.yaml
@@ -26,9 +26,6 @@ importers:
       '@tanstack/react-query':
         specifier: ^5.103.2
         version: 5.103.2(react@19.3.0)
-      '@tanstack/react-table':
-        specifier: ^8.21.3
-        version: 8.21.3(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
       class-variance-authority:
         specifier: ^0.7.1
         version: 0.7.1
@@ -541,17 +538,6 @@ packages:
     peerDependencies:
       react: ^18 || ^19
 
-  '@tanstack/react-table@8.21.3':
-    resolution: {integrity: sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      react: '>=16.8'
-      react-dom: '>=16.8'
-
-  '@tanstack/table-core@8.21.3':
-    resolution: {integrity: sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==}
-    engines: {node: '>=12'}
-
   '@types/chai@5.2.3':
     resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
 
@@ -1694,14 +1680,6 @@ snapshots:
       '@tanstack/query-core': 5.103.2
       react: 19.3.0
 
-  '@tanstack/react-table@8.21.3(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
-    dependencies:
-      '@tanstack/table-core': 8.21.3
-      react: 19.3.0
-      react-dom: 19.3.0(react@19.3.0)
-
-  '@tanstack/table-core@8.21.3': {}
-
   '@types/chai@5.2.3':
     dependencies:
       '@types/deep-eql': 4.0.2
diff --git a/apps/web/src/ConsoleApp.tsx b/apps/web/src/ConsoleApp.tsx
index b9ce5881e..8e55c738e 100644
--- a/apps/web/src/ConsoleApp.tsx
+++ b/apps/web/src/ConsoleApp.tsx
@@ -19,7 +19,7 @@ import { SessionPage } from "./features/sessions/SessionPage";
 import { SkillsPage } from "./features/skills/SkillsPage";
 import { SettingsPage } from "./features/settings/SettingsPage";
 import { VaultsPage } from "./features/vaults/VaultsPage";
-import { consoleDepth, ConsoleNavigationContext, useConsoleNavigation, hashWithParams, routeParamsFromHash, type ConsoleIntent, type RouteParams } from "./lib/console-navigation";
+import { consoleDepth, ConsoleNavigationContext, hashWithParams, routeParamsFromHash, type ConsoleIntent, type RouteParams } from "./lib/console-navigation";
 import { consoleHashForView, consoleNavParent, consoleViewFromHash, type ConsoleView } from "./lib/console-routes";
 import { ProjectsProvider, useProjects } from "./lib/projects";
 import { collectionQuery, collections, filesCollection, queryClient, type CollectionSpec } from "./lib/queries";
diff --git a/apps/web/src/app/beautifui/foundation.css b/apps/web/src/app/beautifui/foundation.css
index eb9a3b892..8d2a26ce0 100644
--- a/apps/web/src/app/beautifui/foundation.css
+++ b/apps/web/src/app/beautifui/foundation.css
@@ -211,30 +211,6 @@ a {
   text-decoration-skip-ink: auto;
 }
 
-/* theme switches swap every token at once — freeze transitions so the flip
- * is one clean repaint instead of hundreds of mismatched color fades */
-.theme-switching *,
-.theme-switching *::before,
-.theme-switching *::after {
-  transition: none !important;
-}
-
-/* touch: :hover sticks after a tap, so neutralize row/header hovers there */
-@media (hover: none) {
-  .records-row:hover > .records-cell {
-    background: transparent;
-  }
-
-  .records-row:hover > td.is-colsel {
-    background: color-mix(in srgb, var(--accent) 4%, var(--surface));
-  }
-
-  .records-header-button:hover {
-    background: transparent;
-    color: var(--ink-2);
-  }
-}
-
 /* Tailwind v4 resets buttons to cursor:default — anything
  * clickable must invite the click */
 button:not(:disabled),
@@ -258,73 +234,6 @@ select:focus-visible,
   outline: none;
 }
 
-.animated-underline {
-  position: relative;
-  display: inline-block;
-}
-
-.animated-underline::after {
-  position: absolute;
-  right: 0;
-  bottom: -1px;
-  left: 0;
-  height: 1px;
-  content: "";
-  background: currentColor;
-  transform: scaleX(0);
-  transform-origin: left center;
-  transition: transform 280ms var(--ease-link);
-}
-
-a:hover .animated-underline::after,
-a:focus-visible .animated-underline::after {
-  transform: scaleX(1);
-}
-
-/* ══════════════════════════════════════════════════════════
- * COMPONENT-SPECIFIC — StreamingText / ContextCards
- * Favicon source avatars.
- * Copy this block only alongside StreamingText / ContextCards; it is not part of the
- * generic foundation above.
- * ══════════════════════════════════════════════════════════ */
-.source-avatar {
-  box-shadow: 0 0 0 1px oklch(0.21 0.034 263.436 / 0.1);
-}
-
-.dark .source-avatar {
-  box-shadow: 0 0 0 1px oklch(1 0 0 / 0.08);
-}
-
-/* ── primitive spacing system ─────────────────────────────
- * Shared optical offsets for small demo cards. Use these
- * instead of hand-tuning 10/12/14px per component.
- */
-
-.primitive-card-pad {
-  padding: 12px;
-}
-
-.primitive-card-bar {
-  padding: 10px 12px;
-}
-
-.primitive-card-footer {
-  padding: 10px;
-}
-
-.primitive-table-cell {
-  padding: 10px 12px;
-}
-
-.primitive-icon-button {
-  display: inline-flex;
-  width: 28px;
-  height: 28px;
-  align-items: center;
-  justify-content: center;
-  border-radius: var(--radius-control);
-}
-
 /* ── shared keyframes ─────────────────────────────────── */
 
 @keyframes shimmer-text {
@@ -347,114 +256,6 @@ a:focus-visible .animated-underline::after {
   }
 }
 
-.home-reveal {
-  will-change: opacity, transform, filter;
-}
-
-
-/* ── filter table electric status colors ─────────────────── */
-
-/* ══════════════════════════════════════════════════════════
- * COMPONENT-SPECIFIC — FilterTable
- * Electric status-pill colors.
- * Copy this block only alongside FilterTable; it is not part of the
- * generic foundation above.
- * ══════════════════════════════════════════════════════════ */
-.filter-status-todo,
-.filter-status-progress,
-.filter-status-done {
-  border: 1px solid transparent;
-}
-
-/* ══════════════════════════════════════════════════════════
- * COMPONENT-SPECIFIC — InsightCards
- * Liveline chart tooltip + cursor.
- * Copy this block only alongside InsightCards; it is not part of the
- * generic foundation above.
- * ══════════════════════════════════════════════════════════ */
-.insight-chart-stage {
-  overflow: hidden;
-}
-
-.insight-chart-cursor {
-  position: absolute;
-  z-index: 4;
-  top: 0;
-  bottom: 0;
-  width: 1px;
-  background: var(--ink);
-  opacity: 0.26;
-  pointer-events: none;
-}
-
-.insight-chart-tooltip-anchor {
-  position: absolute;
-  z-index: 5;
-  top: 8px;
-  transform: translateX(-50%);
-  pointer-events: none;
-}
-
-.insight-chart-tooltip {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  padding: 5px 9px;
-  border: 1px solid var(--line-strong);
-  border-radius: 8px;
-  color: var(--tooltip-fg);
-  background: var(--tooltip-bg);
-  box-shadow: var(--shadow-overlay);
-  font-size: 11.5px;
-  font-variant-numeric: tabular-nums;
-  white-space: nowrap;
-}
-
-.insight-chart-tooltip-item {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-}
-
-.insight-chart-tooltip-dot {
-  width: 8px;
-  height: 8px;
-  flex: 0 0 8px;
-  border-radius: 50%;
-}
-
-/* Status pills share the same base-hue → color-mix derivation as .records-tag,
- * so both components stay consistent across light and dark. */
-.filter-status-todo {
-  --tag-base: oklch(0.757 0.153 66.401);
-}
-.filter-status-progress {
-  --tag-base: oklch(0.671 0.118 219.351);
-}
-.filter-status-done {
-  --tag-base: oklch(0.652 0.131 162.865);
-}
-
-.filter-status-todo,
-.filter-status-progress,
-.filter-status-done {
-  color: color-mix(in srgb, var(--tag-base) 92%, var(--ink));
-  background: color-mix(in srgb, var(--tag-base) 20%, var(--surface));
-  border-color: color-mix(in srgb, var(--tag-base) 34%, var(--surface));
-}
-
-/* Dark mode — a richer, saturated same-hue fill
- * with bright same-hue text and no visible border (light mode keeps the soft
- * tinted pastels above). Applies to both the records grid and status pills. */
-.dark .records-tag,
-.dark .filter-status-todo,
-.dark .filter-status-progress,
-.dark .filter-status-done {
-  color: color-mix(in srgb, var(--tag-base) 86%, white);
-  background: color-mix(in srgb, var(--tag-base) 34%, var(--surface));
-  border-color: color-mix(in srgb, var(--tag-base) 34%, var(--surface));
-}
-
 @keyframes fade-in {
   from {
     opacity: 0;
@@ -474,39 +275,6 @@ a:focus-visible .animated-underline::after {
   }
 }
 
-/* ── StreamText primitive ─────────────────────────────────
- * Fast character reveal: the newest few characters carry a
- * soft, masked blur so the leading edge resolves smoothly as
- * text flows in. The caret holds solid while streaming, then
- * blinks once the string settles. */
-/* ══════════════════════════════════════════════════════════
- * COMPONENT-SPECIFIC — StreamText
- * The streaming caret + tail.
- * Copy this block only alongside StreamText; it is not part of the
- * generic foundation above.
- * ══════════════════════════════════════════════════════════ */
-.stream-tail {
-  filter: blur(1.6px);
-  -webkit-mask-image: linear-gradient(to right, oklch(0 0 0) 20%, oklch(0 0 0 / 0.2));
-  mask-image: linear-gradient(to right, oklch(0 0 0) 20%, oklch(0 0 0 / 0.2));
-}
-
-.stream-caret {
-  display: inline-block;
-  width: 2px;
-  height: 1.05em;
-  margin-left: 1.5px;
-  translate: 0 -0.5px;
-  border-radius: 1px;
-  background: var(--ink);
-  vertical-align: text-bottom;
-  animation: caret-blink 1s step-end infinite;
-}
-
-.stream-caret.is-streaming {
-  animation: none;
-}
-
 @keyframes caret-blink {
   0%,
   100% {
@@ -517,17 +285,6 @@ a:focus-visible .animated-underline::after {
   }
 }
 
-@media (prefers-reduced-motion: reduce) {
-  .stream-caret {
-    animation: none;
-  }
-  .stream-tail {
-    filter: none;
-    -webkit-mask-image: none;
-    mask-image: none;
-  }
-}
-
 @keyframes pop-in {
   from {
     opacity: 0;
diff --git a/apps/web/src/components/atoms/Button.tsx b/apps/web/src/components/atoms/Button.tsx
deleted file mode 100644
index af0bfca1b..000000000
--- a/apps/web/src/components/atoms/Button.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-"use client";
-
-import { ButtonHTMLAttributes } from "react";
-import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/lib/utils";
-
-const filledShadow = "shadow-[inset_0_1px_0_rgba(255,255,255,0.14)]";
-
-/* Pill-shaped by default — the app's core button style. Explicit symmetric
- * padding (not a fixed height) so the top/bottom spacing is always equal. */
-export const buttonVariants = cva(
-  `inline-flex items-center justify-center font-medium select-none
-   transition-[transform,background-color,opacity] duration-150 ease-out
-   active:scale-[0.96] disabled:opacity-50 disabled:pointer-events-none`,
-  {
-    variants: {
-      variant: {
-        primary: `bg-ink text-canvas hover:opacity-90 dark:bg-ink dark:text-canvas ${filledShadow}`,
-        secondary: "bg-surface text-ink shadow-btn hover:bg-inset aria-expanded:bg-hover",
-        ghost: "bg-hover-2 text-ink hover:bg-line-strong",
-        accent: `bg-accent text-white hover:bg-accent-ink ${filledShadow}`,
-        success: `bg-green text-white hover:brightness-95 ${filledShadow}`,
-        /* transparent until hovered — for dense toolbars/action rows */
-        quiet: "text-ink hover:bg-hover",
-      },
-      size: {
-        /* compact toolbar pill — fixed height, lighter weight */
-        xs: "h-7 rounded-full px-2.5 text-[12px] font-normal leading-none gap-1",
-        /* canonical action pill — 27px tall, roomy sides */
-        sm: "h-[27px] px-3 text-[13px] leading-none rounded-full gap-1.5",
-        md: "px-4 py-[9px] text-sm leading-none rounded-full gap-2",
-      },
-    },
-    defaultVariants: { variant: "secondary", size: "md" },
-  },
-);
-
-export type ButtonVariant = NonNullable<VariantProps<typeof buttonVariants>["variant"]>;
-
-export function Button({
-  variant,
-  size,
-  className,
-  ...props
-}: ButtonHTMLAttributes<HTMLButtonElement> & VariantProps<typeof buttonVariants>) {
-  return <button className={cn(buttonVariants({ variant, size }), className)} {...props} />;
-}
diff --git a/apps/web/src/components/atoms/EntityChip.tsx b/apps/web/src/components/atoms/EntityChip.tsx
index b7170f065..dd762fdaf 100644
--- a/apps/web/src/components/atoms/EntityChip.tsx
+++ b/apps/web/src/components/atoms/EntityChip.tsx
@@ -17,28 +17,3 @@ export function Monogram({
     </span>
   );
 }
-
-/** Inline entity reference — a monogram + name in a soft field pill.
- *  Names a supplier, person, or record inside running text. Softer than a
- *  StatusPill (no dot, no state) and not a mono token (see Chip). */
-export function EntityChip({
-  name,
-  color,
-  monogram,
-  className = "",
-}: {
-  name: string;
-  color?: string;
-  monogram?: React.ReactNode;
-  className?: string;
-}) {
-  return (
-    <span
-      className={`mx-0.5 inline-flex items-center gap-1 rounded-full bg-field
-        py-px pl-[3px] pr-1.5 align-middle shadow-hairline ${className}`}
-    >
-      <Monogram color={color}>{monogram ?? name.charAt(0)}</Monogram>
-      <span className="text-[12px] font-medium text-ink">{name}</span>
-    </span>
-  );
-}
diff --git a/apps/web/src/components/charts/chart-scale.ts b/apps/web/src/components/charts/chart-scale.ts
index 0e021f9e1..675c11a69 100644
--- a/apps/web/src/components/charts/chart-scale.ts
+++ b/apps/web/src/components/charts/chart-scale.ts
@@ -27,10 +27,6 @@ export function tickIndices(length: number, maximum = 6): number[] {
   return indices;
 }
 
-export function formatCompactNumber(value: number, locale?: string): string {
-  return new Intl.NumberFormat(locale, { notation: "compact", maximumFractionDigits: value >= 1000 ? 1 : 0 }).format(value);
-}
-
 export function formatBucketTime(seconds: number, bucketSeconds: number, spanSeconds: number, locale?: string): string {
   const date = new Date(seconds * 1000);
   if (spanSeconds > 36 * 3600) {
diff --git a/apps/web/src/components/console-ui.test.tsx b/apps/web/src/components/console-ui.test.tsx
index b0ff60ac1..ef81c9789 100644
--- a/apps/web/src/components/console-ui.test.tsx
+++ b/apps/web/src/components/console-ui.test.tsx
@@ -1,8 +1,6 @@
 import { renderToStaticMarkup } from "react-dom/server";
 import { describe, expect, it } from "vitest";
 
-import type { AgentSession, RuntimeObservation } from "@oac/agents-client";
-
 import { HelpTip, Kpi, KpiStrip, PageHeader } from "./console-ui";
 
 describe("console grammar", () => {
diff --git a/apps/web/src/components/magicui/animated-shiny-text.tsx b/apps/web/src/components/magicui/animated-shiny-text.tsx
deleted file mode 100644
index 02b24c193..000000000
--- a/apps/web/src/components/magicui/animated-shiny-text.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import {
-  type ComponentPropsWithoutRef,
-  type CSSProperties,
-  type FC,
-} from "react"
-
-import { cn } from "@/lib/utils"
-
-export interface AnimatedShinyTextProps extends ComponentPropsWithoutRef<"span"> {
-  shimmerWidth?: number
-}
-
-export const AnimatedShinyText: FC<AnimatedShinyTextProps> = ({
-  children,
-  className,
-  shimmerWidth = 100,
-  ...props
-}) => {
-  return (
-    <span
-      style={
-        {
-          "--shiny-width": `${shimmerWidth}px`,
-        } as CSSProperties
-      }
-      className={cn(
-        "mx-auto max-w-md text-neutral-600/70 dark:text-neutral-400/70",
-
-        // Shine effect
-        "animate-shiny-text bg-size-[var(--shiny-width)_100%] bg-clip-text bg-position-[0_0] bg-no-repeat [transition:background-position_1s_cubic-bezier(.6,.6,0,1)_infinite]",
-
-        // Shine gradient
-        "bg-linear-to-r from-transparent via-black/80 via-50% to-transparent dark:via-white/80",
-
-        className
-      )}
-      {...props}
-    >
-      {children}
-    </span>
-  )
-}
diff --git a/apps/web/src/components/magicui/blur-fade.tsx b/apps/web/src/components/magicui/blur-fade.tsx
deleted file mode 100644
index a8aa58630..000000000
--- a/apps/web/src/components/magicui/blur-fade.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-"use client"
-
-import { useRef } from "react"
-import * as m from "motion/react-m"
-import {
-  AnimatePresence,
-  useInView,
-  type MotionProps,
-  type UseInViewOptions,
-  type Variants,
-} from "motion/react"
-
-type MarginType = UseInViewOptions["margin"]
-
-interface BlurFadeProps extends MotionProps {
-  children: React.ReactNode
-  className?: string
-  variant?: {
-    hidden: { y: number }
-    visible: { y: number }
-  }
-  duration?: number
-  delay?: number
-  offset?: number
-  direction?: "up" | "down" | "left" | "right"
-  inView?: boolean
-  inViewMargin?: MarginType
-  blur?: string
-}
-
-const getFilter = (v: Variants[string]) =>
-  typeof v === "function" ? undefined : v.filter
-
-export function BlurFade({
-  children,
-  className,
-  variant,
-  duration = 0.4,
-  delay = 0,
-  offset = 6,
-  direction = "down",
-  inView = false,
-  inViewMargin = "-50px",
-  blur = "6px",
-  ...props
-}: BlurFadeProps) {
-  const ref = useRef(null)
-  const inViewResult = useInView(ref, { once: true, margin: inViewMargin })
-  const isInView = !inView || inViewResult
-  const defaultVariants: Variants = {
-    hidden: {
-      [direction === "left" || direction === "right" ? "x" : "y"]:
-        direction === "right" || direction === "down" ? -offset : offset,
-      opacity: 0,
-      filter: `blur(${blur})`,
-    },
-    visible: {
-      [direction === "left" || direction === "right" ? "x" : "y"]: 0,
-      opacity: 1,
-      filter: `blur(0px)`,
-    },
-  }
-  const combinedVariants = variant ?? defaultVariants
-
-  const hiddenFilter = getFilter(combinedVariants.hidden)
-  const visibleFilter = getFilter(combinedVariants.visible)
-
-  const shouldTransitionFilter =
-    hiddenFilter != null &&
-    visibleFilter != null &&
-    hiddenFilter !== visibleFilter
-
-  return (
-    <AnimatePresence>
-      <m.div
-        ref={ref}
-        initial="hidden"
-        animate={isInView ? "visible" : "hidden"}
-        exit="hidden"
-        variants={combinedVariants}
-        transition={{
-          delay: 0.04 + delay,
-          duration,
-          ease: "easeOut",
-          ...(shouldTransitionFilter ? { filter: { duration } } : {}),
-        }}
-        className={className}
-        {...props}
-      >
-        {children}
-      </m.div>
-    </AnimatePresence>
-  )
-}
diff --git a/apps/web/src/components/ui/select.tsx b/apps/web/src/components/ui/select.tsx
index 02280b4fc..664da72c2 100644
--- a/apps/web/src/components/ui/select.tsx
+++ b/apps/web/src/components/ui/select.tsx
@@ -5,9 +5,7 @@
 // console's brand colour), and the popup border names its colour explicitly
 // because the console runs Tailwind without preflight.
 
-import { mergeProps } from "@base-ui/react/merge-props";
 import { Select as SelectPrimitive } from "@base-ui/react/select";
-import { useRender } from "@base-ui/react/use-render";
 import { cva, type VariantProps } from "class-variance-authority";
 import {
   ChevronDownIcon,
@@ -37,41 +35,6 @@ export const selectTriggerVariants = cva(
 
 export const selectTriggerIconClassName = "-me-1 size-4.5 opacity-80 sm:size-4";
 
-export interface SelectButtonProps extends useRender.ComponentProps<"button"> {
-  size?: VariantProps<typeof selectTriggerVariants>["size"];
-}
-
-export function SelectButton({
-  className,
-  size,
-  render,
-  children,
-  ...props
-}: SelectButtonProps): React.ReactElement {
-  const typeValue: React.ButtonHTMLAttributes<HTMLButtonElement>["type"] =
-    render ? undefined : "button";
-
-  const defaultProps = {
-    children: (
-      <>
-        <span className="flex-1 truncate in-data-placeholder:text-muted-foreground/72">
-          {children}
-        </span>
-        <ChevronsUpDownIcon className={selectTriggerIconClassName} />
-      </>
-    ),
-    className: cn(selectTriggerVariants({ size }), "min-w-0", className),
-    "data-slot": "select-button",
-    type: typeValue,
-  };
-
-  return useRender({
-    defaultTagName: "button",
-    props: mergeProps<"button">(defaultProps, props),
-    render,
-  });
-}
-
 export function SelectTrigger({
   className,
   size = "default",
@@ -212,51 +175,4 @@ export function SelectItem({
   );
 }
 
-export function SelectSeparator({
-  className,
-  ...props
-}: SelectPrimitive.Separator.Props): React.ReactElement {
-  return (
-    <SelectPrimitive.Separator
-      className={cn("mx-2 my-1 h-px bg-border", className)}
-      data-slot="select-separator"
-      {...props}
-    />
-  );
-}
-
-export function SelectGroup(
-  props: SelectPrimitive.Group.Props,
-): React.ReactElement {
-  return <SelectPrimitive.Group data-slot="select-group" {...props} />;
-}
-
-export function SelectLabel({
-  className,
-  ...props
-}: SelectPrimitive.Label.Props): React.ReactElement {
-  return (
-    <SelectPrimitive.Label
-      className={cn(
-        "not-in-data-[slot=field]:mb-2 inline-flex cursor-default items-center gap-2 font-medium text-base/4.5 text-foreground sm:text-sm/4",
-        className,
-      )}
-      data-slot="select-label"
-      {...props}
-    />
-  );
-}
-
-export function SelectGroupLabel(
-  props: SelectPrimitive.GroupLabel.Props,
-): React.ReactElement {
-  return (
-    <SelectPrimitive.GroupLabel
-      className="px-2 py-1.5 font-medium text-muted-foreground text-xs"
-      data-slot="select-group-label"
-      {...props}
-    />
-  );
-}
-
-export { SelectPrimitive, SelectPopup as SelectContent };
+export { SelectPrimitive };
diff --git a/apps/web/src/features/agents/AgentsPage.tsx b/apps/web/src/features/agents/AgentsPage.tsx
index b7431d572..daea14d4d 100644
--- a/apps/web/src/features/agents/AgentsPage.tsx
+++ b/apps/web/src/features/agents/AgentsPage.tsx
@@ -1,6 +1,6 @@
 import type { SavedAgent } from "@oac/agents-client";
 import { ArrowLeft, Bot, ListTree, Trash2 } from "lucide-react";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import { useFailureToast } from "../../components/Toast";
@@ -12,7 +12,7 @@ import { coreError } from "../../lib/core-error";
 import { useDeleteFlow } from "../../lib/delete-flow";
 import { formatCompact, formatDateTime, formatInteger, formatPercent, formatRelative, MISSING } from "../../lib/format";
 import { harnessNames, protocolNames } from "../../lib/harness-labels";
-import { admin, CreatorCell, CreatorHeading, forgetCreators, ProjectFilter, ProjectName, projectClient, readAllPages, useCreators, useProjectCollection, useProjects, type Owned } from "../../lib/projects";
+import { CreatorCell, CreatorHeading, forgetCreators, ProjectFilter, ProjectName, projectClient, useCreators, useProjectCollection, useProjects, type Owned } from "../../lib/projects";
 import "./AgentCatalog.css";
 import { type ProjectSummary } from "../../lib/admin-view";
 import { refreshAgentSummaries, useAgentSummaries } from "./agent-summaries";
diff --git a/apps/web/src/features/api-keys/ProjectDetail.tsx b/apps/web/src/features/api-keys/ProjectDetail.tsx
index 98ea1cb25..0776d4c7b 100644
--- a/apps/web/src/features/api-keys/ProjectDetail.tsx
+++ b/apps/web/src/features/api-keys/ProjectDetail.tsx
@@ -9,7 +9,6 @@ import { CopyableId, RowActions } from "../../components/list-ui";
 import { epochSeconds, formatCompact, formatDateTime, formatInteger, formatRelative } from "../../lib/format";
 import { useConsoleNavigation } from "../../lib/console-navigation";
 import type { ConsoleView } from "../../lib/console-routes";
-import { admin } from "../../lib/projects";
 import { ProjectHowToCall } from "./HowToCall";
 import { prefixLabel } from "./key-flows";
 import { loadedFrom, projectKeysQuery, projectSummaryQuery, type Loaded } from "./project-queries";
diff --git a/apps/web/src/features/api-keys/WriteOperations.tsx b/apps/web/src/features/api-keys/WriteOperations.tsx
index 378e61c30..2c584aef0 100644
--- a/apps/web/src/features/api-keys/WriteOperations.tsx
+++ b/apps/web/src/features/api-keys/WriteOperations.tsx
@@ -9,7 +9,6 @@ import { useFailureToast } from "../../components/Toast";
 import { EmptyState, Section } from "../../components/console-ui";
 import { CopyableId, ListToolbar, listSummary } from "../../components/list-ui";
 import { epochSeconds, formatDateTime, shortId } from "../../lib/format";
-import { admin } from "../../lib/projects";
 import { prefixLabel } from "./key-flows";
 import { writeOperationsQuery } from "./project-queries";
 import { TableSkeleton } from "../../components/Skeleton";
diff --git a/apps/web/src/features/api-keys/api-keys.css b/apps/web/src/features/api-keys/api-keys.css
index b27b929c1..7253795e6 100644
--- a/apps/web/src/features/api-keys/api-keys.css
+++ b/apps/web/src/features/api-keys/api-keys.css
@@ -1,8 +1,4 @@
-/* Platform › Projects and keys: list, detail and the one-time key. */
 
-.project-source.config {
-  color: var(--fg-muted);
-}
 
 /* Up to six short facts sit on one line. */
 .projects-page .resource-facts {
diff --git a/apps/web/src/features/api-keys/key-flows.test.ts b/apps/web/src/features/api-keys/key-flows.test.ts
index 054c63227..5b1b48f3b 100644
--- a/apps/web/src/features/api-keys/key-flows.test.ts
+++ b/apps/web/src/features/api-keys/key-flows.test.ts
@@ -11,7 +11,6 @@ import {
   keyFlowReducer,
   keyNameProblem,
   matchesProject,
-  pendingPlaintext,
   projectNameProblem,
   sortKeys,
   type KeyFlow,
@@ -77,12 +76,12 @@ describe("issuing a key", () => {
 
   it("keeps the plaintext until the operator confirms it was saved, then drops it", () => {
     const shown = run([{ type: "openIssue", project }, { type: "setName", name: "bob-laptop" }, { type: "started" }, { type: "issued", projectId: project.id, key: issued }]);
-    expect(pendingPlaintext(shown)?.key).toBe(secret);
+    expect(shown).toMatchObject({ step: "issued", issued: { key: secret } });
     // Cancelling or closing the dialog never discards a key shown only once.
     expect(keyFlowReducer(shown, { type: "cancel" })).toBe(shown);
     const hidden = keyFlowReducer(shown, { type: "hideIssued" });
     expect(hidden).toMatchObject({ step: "issued", open: false });
-    expect(pendingPlaintext(hidden)?.key).toBe(secret);
+    expect(hidden).toMatchObject({ issued: { key: secret } });
     // A second issuance cannot start while this one waits.
     expect(keyFlowReducer(hidden, { type: "openIssue", project })).toBe(hidden);
     const saved = keyFlowReducer(hidden, { type: "saved" });
diff --git a/apps/web/src/features/api-keys/key-flows.ts b/apps/web/src/features/api-keys/key-flows.ts
index 8d4d04011..423919b03 100644
--- a/apps/web/src/features/api-keys/key-flows.ts
+++ b/apps/web/src/features/api-keys/key-flows.ts
@@ -124,11 +124,6 @@ export function keyFlowReducer(flow: KeyFlow, event: KeyFlowEvent): KeyFlow {
   }
 }
 
-/** The plaintext currently held by a flow, if any. */
-export function pendingPlaintext(flow: KeyFlow): AdminIssuedAPIKey | null {
-  return flow.step === "issued" ? flow.issued : null;
-}
-
 /** Active keys first, then newest first. */
 export function sortKeys(keys: readonly AdminAPIKey[]): AdminAPIKey[] {
   return [...keys].sort((a, b) => Number(a.revoked_at !== null) - Number(b.revoked_at !== null) || Date.parse(b.created_at) - Date.parse(a.created_at) || a.id.localeCompare(b.id));
diff --git a/apps/web/src/features/dashboard/dashboard-model.test.ts b/apps/web/src/features/dashboard/dashboard-model.test.ts
deleted file mode 100644
index fad5379a9..000000000
--- a/apps/web/src/features/dashboard/dashboard-model.test.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { canonicalUsage, formatDashboardTokens } from "./dashboard-model";
-import { holdLastReported } from "./held-usage";
-
-const usage = { input_tokens: 10, output_tokens: 5, total_tokens: 15, input_tokens_details: { cached_tokens: 2 }, output_tokens_details: { reasoning_tokens: 1 } };
-
-describe("canonicalUsage", () => {
-  it("accepts complete usage and rejects missing or unsafe figures", () => {
-    expect(canonicalUsage(usage)).toBe(usage);
-    expect(canonicalUsage(null)).toBeNull();
-    expect(canonicalUsage({ ...usage, input_tokens_details: null })).toBeNull();
-    expect(canonicalUsage({ ...usage, total_tokens: -1 })).toBeNull();
-    expect(canonicalUsage({ ...usage, output_tokens: Number.MAX_SAFE_INTEGER + 1 })).toBeNull();
-  });
-
-  it("formats token totals and keeps an absent total unavailable", () => {
-    expect(formatDashboardTokens(1_234, "en-US")).toBe("1,234");
-    expect(formatDashboardTokens(null)).toBe("Unavailable");
-  });
-});
-
-describe("holdLastReported", () => {
-  it("keeps a listed Session's last value while it reports none and drops unlisted Sessions", () => {
-    const held = holdLastReported(new Map([["a", 10], ["gone", 3]]), new Map<string, number | null>([["a", null], ["b", 4]]));
-    expect([...held]).toEqual([["a", 10], ["b", 4]]);
-  });
-});
diff --git a/apps/web/src/features/dashboard/dashboard-model.ts b/apps/web/src/features/dashboard/dashboard-model.ts
deleted file mode 100644
index 2afac2308..000000000
--- a/apps/web/src/features/dashboard/dashboard-model.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { TokenUsage } from "@oac/agents-client";
-
-function record(value: unknown): Record<string, unknown> | null {
-  return value !== null && typeof value === "object" && !Array.isArray(value)
-    ? value as Record<string, unknown>
-    : null;
-}
-
-function safeNonNegativeInteger(value: unknown): number | null {
-  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
-}
-
-/** A complete, safe token usage object, or null when any figure is missing or unsafe. */
-export function canonicalUsage(value: unknown): TokenUsage | null {
-  const usage = record(value);
-  const inputDetails = record(usage?.input_tokens_details);
-  const outputDetails = record(usage?.output_tokens_details);
-  if (!usage || !inputDetails || !outputDetails) return null;
-  if (
-    safeNonNegativeInteger(usage.input_tokens) === null ||
-    safeNonNegativeInteger(usage.output_tokens) === null ||
-    safeNonNegativeInteger(usage.total_tokens) === null ||
-    safeNonNegativeInteger(inputDetails.cached_tokens) === null ||
-    safeNonNegativeInteger(outputDetails.reasoning_tokens) === null
-  ) return null;
-  return value as TokenUsage;
-}
-
-export function formatDashboardTokens(value: number | null, locale = "en-US"): string {
-  if (value === null) return "Unavailable";
-  return value.toLocaleString(locale);
-}
diff --git a/apps/web/src/features/dashboard/held-usage.ts b/apps/web/src/features/dashboard/held-usage.ts
deleted file mode 100644
index b250c9da0..000000000
--- a/apps/web/src/features/dashboard/held-usage.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Public Session usage is null while a root Turn runs and after a Turn ends
- * unmeasured. Dashboard token totals keep each listed Session's last reported
- * value instead, so they neither drop to zero nor break. A newly reported value
- * replaces the held one, and Sessions no longer listed are dropped.
- */
-export function holdLastReported<T>(
-  previous: ReadonlyMap<string, T>,
-  current: ReadonlyMap<string, T | null>,
-): Map<string, T> {
-  const held = new Map<string, T>();
-  for (const [sessionId, value] of current) {
-    const kept = value ?? previous.get(sessionId);
-    if (kept !== undefined) held.set(sessionId, kept);
-  }
-  return held;
-}
diff --git a/apps/web/src/features/dashboard/runtime-history.ts b/apps/web/src/features/dashboard/runtime-history.ts
index 7d11b08c8..b4cb00e82 100644
--- a/apps/web/src/features/dashboard/runtime-history.ts
+++ b/apps/web/src/features/dashboard/runtime-history.ts
@@ -142,7 +142,6 @@ export function runtimeDurableTrendSamples(
       sampledAt: value.sampledAt,
       activeSandboxCount: value.hasObservationCoverage ? value.activeSandboxes.size : null,
       targets: [...value.targets.values()],
-      cpuCandidates: [],
       memoryUsageBytes: observedMemory.length > 0
         ? observedMemory.reduce((total, current) => total + current.usage, 0)
         : null,
diff --git a/apps/web/src/features/dashboard/runtime-trends.test.ts b/apps/web/src/features/dashboard/runtime-trends.test.ts
deleted file mode 100644
index 643703797..000000000
--- a/apps/web/src/features/dashboard/runtime-trends.test.ts
+++ /dev/null
@@ -1,369 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import type { AgentSession, RuntimeObservation } from "@oac/agents-client";
-
-import type { RuntimeDashboardSnapshot } from "./runtime-snapshot";
-import {
-  appendRuntimeTrendSample,
-  RUNTIME_TREND_MAX_TARGETS,
-  runtimeTrendRange,
-  runtimeTrendSample,
-  tokenThroughput,
-  type RuntimeTrendSample,
-} from "./runtime-trends";
-
-function snapshot(at: number, options: {
-  input?: number;
-  output?: number;
-  cpuRatio?: number | null;
-  cpuUsageCores?: number | null;
-  cpuUsageSecondsTotal?: number;
-  cpuCapacity?: number;
-  memory?: number;
-  startedAt?: number | null;
-  allocationId?: string;
-  observedAt?: number;
-} = {}): RuntimeDashboardSnapshot {
-  const sessionId = "11111111-1111-4111-8111-111111111111";
-  const observedAt = options.observedAt ?? Math.floor(at / 1_000);
-  const input = options.input ?? 100;
-  const output = options.output ?? 20;
-  const session = {
-    id: sessionId,
-    object: "agent.session",
-    metadata: { title: "Runtime worker" },
-    agent: {
-      id: "agent-1",
-      name: "Worker",
-      model: "fixture/model",
-      instructions: null,
-      multi_agent: { enabled: false, max_concurrent_subagents: null },
-      reasoning: { effort: null, summary: null },
-      service_tier: "auto",
-      text: { format: { type: "text" }, verbosity: "medium" },
-      tools: [],
-    },
-    environment: { type: "none" },
-    status: "idle",
-    error: null,
-    required_actions: [],
-    vault_ids: [],
-    usage: {
-      input_tokens: input,
-      output_tokens: output,
-      total_tokens: input + output,
-      input_tokens_details: { cached_tokens: 0 },
-      output_tokens_details: { reasoning_tokens: 0 },
-    },
-    created_at: observedAt - 180,
-    last_active_at: observedAt,
-  } as AgentSession;
-  const observation = {
-    id: sessionId,
-    object: "agent.runtime_observation",
-    session_id: sessionId,
-    environment_id: "22222222-2222-4222-8222-222222222222",
-    mode: "openai_hosted",
-    status: "observed",
-    reason: null,
-    provider_type: "docker",
-    instance: {
-      kind: "managed_allocation",
-      allocation_id: options.allocationId ?? "33333333-3333-4333-8333-333333333333",
-      device_id: null,
-      connection_generation: null,
-    },
-    lifecycle_state: "active",
-    allocation_created_at: observedAt - 180,
-    resolved_at: observedAt,
-    observed_at: observedAt,
-    started_at: options.startedAt === undefined ? observedAt - 120 : options.startedAt,
-    cpu: {
-      utilization_ratio: Object.hasOwn(options, "cpuRatio") ? options.cpuRatio ?? null : .25,
-      usage_cores: Object.hasOwn(options, "cpuUsageCores") ? options.cpuUsageCores ?? null : .5,
-      capacity_cores: options.cpuCapacity ?? 2,
-      usage_seconds_total: options.cpuUsageSecondsTotal ?? 30,
-    },
-    memory: { usage_bytes: options.memory ?? 512, limit_bytes: 1_024 },
-  } as RuntimeObservation;
-  return { sessions: [session], observations: [observation], loadedAt: at };
-}
-
-describe("Runtime live-window trends", () => {
-  const cpuTarget = (sample: RuntimeTrendSample | undefined) => sample?.targets[0];
-
-  it("projects only honest point-in-time and cumulative Session values", () => {
-    const sample = runtimeTrendSample(snapshot(120_000));
-    expect(sample).toMatchObject({
-      sampledAt: 120_000,
-      activeSandboxCount: 1,
-      tokenTotals: [{
-        sessionId: "11111111-1111-4111-8111-111111111111",
-        inputTokens: 100,
-        outputTokens: 20,
-      }],
-      memoryUsageBytes: 512,
-      memoryLimitBytes: 1_024,
-    });
-    expect(sample.targets).toEqual([expect.objectContaining({
-      label: "Runtime worker",
-      cpuRatio: .25,
-    })]);
-  });
-
-  it("projects a managed Session without an allocation as inactive", () => {
-    const pending = snapshot(120_000);
-    pending.observations = [{
-      ...pending.observations[0]!,
-      instance: { kind: "managed_allocation", allocation_id: null, device_id: null, connection_generation: null },
-      lifecycle_state: "pending",
-      status: "unavailable",
-      reason: "allocation_pending",
-      allocation_created_at: null,
-      observed_at: null,
-      started_at: null,
-      cpu: null,
-      memory: null,
-    } as RuntimeObservation];
-
-    expect(runtimeTrendSample(pending)).toMatchObject({ activeSandboxCount: 0, targets: [] });
-  });
-
-  it("deduplicates live aggregate count and memory by Runtime allocation identity", () => {
-    const duplicate = snapshot(120_000);
-    const secondSession = {
-      ...duplicate.sessions[0]!,
-      id: "44444444-4444-4444-8444-444444444444",
-    } as AgentSession;
-    const secondObservation = {
-      ...duplicate.observations[0]!,
-      id: secondSession.id,
-      session_id: secondSession.id,
-      observed_at: (duplicate.observations[0]!.observed_at ?? 0) + 1,
-      memory: { usage_bytes: 128, limit_bytes: 256 },
-    } as RuntimeObservation;
-    duplicate.sessions.push(secondSession);
-    duplicate.observations.push(secondObservation);
-
-    expect(runtimeTrendSample(duplicate)).toMatchObject({
-      activeSandboxCount: 1,
-      memoryUsageBytes: 128,
-      memoryLimitBytes: 256,
-    });
-  });
-
-  it("keeps lifecycle-active allocation count when resource metrics are unavailable", () => {
-    const unavailable = snapshot(180_000);
-    unavailable.observations[0] = {
-      ...unavailable.observations[0]!,
-      status: "unavailable",
-      reason: "runtime_not_running",
-      observed_at: null,
-      started_at: null,
-      cpu: null,
-      memory: null,
-    } as RuntimeObservation;
-
-    expect(runtimeTrendSample(unavailable)).toMatchObject({
-      activeSandboxCount: 1,
-      memoryUsageBytes: null,
-      memoryLimitBytes: null,
-      targets: [],
-    });
-  });
-
-  it("deduplicates refreshes and bounds the rolling window", () => {
-    let samples = appendRuntimeTrendSample([], snapshot(60_000), 120_000, 2);
-    samples = appendRuntimeTrendSample(samples, snapshot(120_000));
-    samples = appendRuntimeTrendSample(samples, snapshot(120_000, { memory: 768 }), 120_000, 2);
-    samples = appendRuntimeTrendSample(samples, snapshot(180_000), 120_000, 2);
-    expect(samples.map((sample) => sample.sampledAt)).toEqual([120_000, 180_000]);
-    expect(samples[0]?.memoryUsageBytes).toBe(768);
-  });
-
-  it("selects a live range relative to the newest complete snapshot", () => {
-    const samples = [
-      runtimeTrendSample(snapshot(0)),
-      runtimeTrendSample(snapshot(10 * 60_000)),
-      runtimeTrendSample(snapshot(30 * 60_000)),
-      runtimeTrendSample(snapshot(60 * 60_000)),
-    ];
-    expect(runtimeTrendRange(samples, 15 * 60_000).map((sample) => sample.sampledAt))
-      .toEqual([60 * 60_000]);
-    expect(runtimeTrendRange(samples, 60 * 60_000).map((sample) => sample.sampledAt))
-      .toEqual([0, 10 * 60_000, 30 * 60_000, 60 * 60_000]);
-  });
-
-  it("derives throughput only between monotonic cumulative samples", () => {
-    let samples = appendRuntimeTrendSample([], snapshot(60_000, { input: 100, output: 20 }));
-    samples = appendRuntimeTrendSample(samples, snapshot(120_000, { input: 220, output: 50 }));
-    samples = appendRuntimeTrendSample(samples, snapshot(180_000, { input: 10, output: 5 }));
-    expect(tokenThroughput(samples)).toEqual([
-      { sampledAt: 60_000, inputPerMinute: null, outputPerMinute: null },
-      { sampledAt: 120_000, inputPerMinute: 120, outputPerMinute: 30 },
-      { sampledAt: 180_000, inputPerMinute: null, outputPerMinute: null },
-    ]);
-  });
-
-  it("derives real CPU utilization from cumulative samples within one allocation", () => {
-    const cumulative = (at: number, usage: number) => snapshot(at, {
-      cpuRatio: null,
-      cpuUsageCores: null,
-      cpuUsageSecondsTotal: usage,
-      cpuCapacity: 2,
-      startedAt: 0,
-    });
-    let samples = appendRuntimeTrendSample([], cumulative(60_000, 10));
-    samples = appendRuntimeTrendSample(samples, cumulative(120_000, 70));
-    samples = appendRuntimeTrendSample(samples, cumulative(180_000, 130));
-    expect(samples.map((sample) => cpuTarget(sample)?.cpuRatio ?? null)).toEqual([null, .5, .5]);
-  });
-
-  it("uses allocation identity for Live chart series while ignoring start-time jitter", () => {
-    const first = runtimeTrendSample(snapshot(60_000, { cpuRatio: .25, startedAt: 0 }));
-    const jittered = runtimeTrendSample(snapshot(120_000, { cpuRatio: .5, startedAt: 1 }));
-    const replaced = runtimeTrendSample(snapshot(180_000, {
-      cpuRatio: .5,
-      startedAt: 1,
-      allocationId: "44444444-4444-4444-8444-444444444444",
-    }));
-    expect(cpuTarget(first)?.seriesId).toBe(cpuTarget(jittered)?.seriesId);
-    expect(cpuTarget(replaced)?.seriesId).not.toBe(cpuTarget(first)?.seriesId);
-  });
-
-  it("resets cumulative CPU on start changes, allocation changes or counter regressions", () => {
-    const base = snapshot(60_000, {
-      cpuRatio: null, cpuUsageCores: null, cpuUsageSecondsTotal: 100, startedAt: 0,
-    });
-    const continued = appendRuntimeTrendSample(appendRuntimeTrendSample([], base), snapshot(120_000, {
-      cpuRatio: null, cpuUsageCores: null, cpuUsageSecondsTotal: 160, startedAt: 1,
-    }));
-    expect(cpuTarget(continued.at(-1))?.cpuRatio ?? null).toBeNull();
-    for (const next of [
-      snapshot(120_000, { cpuRatio: null, cpuUsageCores: null, cpuUsageSecondsTotal: 160, startedAt: 0, allocationId: "44444444-4444-4444-8444-444444444444" }),
-      snapshot(120_000, { cpuRatio: null, cpuUsageCores: null, cpuUsageSecondsTotal: 10, startedAt: 0 }),
-    ]) {
-      const samples = appendRuntimeTrendSample(appendRuntimeTrendSample([], base), next);
-      expect(cpuTarget(samples.at(-1))?.cpuRatio ?? null).toBeNull();
-    }
-  });
-
-  it("starts a fresh CPU baseline after a same-allocation restart even when its counter is higher", () => {
-    const cumulative = (at: number, usage: number, startedAt: number | null) => snapshot(at, {
-      cpuRatio: null, cpuUsageCores: null, cpuUsageSecondsTotal: usage, startedAt,
-    });
-    let samples = appendRuntimeTrendSample([], cumulative(60_000, 1, 0));
-    samples = appendRuntimeTrendSample(samples, cumulative(90_000, 20, 65));
-    samples = appendRuntimeTrendSample(samples, cumulative(120_000, 50, 65));
-    expect(samples.map((sample) => cpuTarget(sample)?.cpuRatio ?? null)).toEqual([null, null, .5]);
-    for (const [priorStart, nextStart] of [[null, 0], [0, null], [null, null]] as const) {
-      const missingFence = appendRuntimeTrendSample(
-        appendRuntimeTrendSample([], cumulative(60_000, 1, priorStart)),
-        cumulative(90_000, 20, nextStart),
-      );
-      expect(cpuTarget(missingFence.at(-1))?.cpuRatio ?? null).toBeNull();
-    }
-  });
-
-  it("keeps directly reported CPU continuous across start changes but not stale observations", () => {
-    const base = snapshot(60_000, { cpuRatio: .25, startedAt: 0 });
-    const continued = appendRuntimeTrendSample(appendRuntimeTrendSample([], base), snapshot(120_000, { cpuRatio: .5, startedAt: 1 }));
-    expect(cpuTarget(continued.at(-1))?.cpuRatio ?? null).toBe(.5);
-    const stale = appendRuntimeTrendSample(
-      appendRuntimeTrendSample([], base),
-      snapshot(120_000, { cpuRatio: .5, startedAt: 0, observedAt: 60 }),
-    );
-    expect(cpuTarget(stale.at(-1))?.cpuRatio ?? null).toBeNull();
-  });
-
-  it("rejects non-finite CPU ratios produced by finite provider inputs", () => {
-    const direct = runtimeTrendSample(snapshot(60_000, {
-      cpuRatio: null,
-      cpuUsageCores: Number.MAX_VALUE,
-      cpuCapacity: Number.MIN_VALUE,
-    }));
-    expect(cpuTarget(direct)?.cpuRatio ?? null).toBeNull();
-
-    const cumulative = (at: number, usage: number) => snapshot(at, {
-      cpuRatio: null,
-      cpuUsageCores: null,
-      cpuUsageSecondsTotal: usage,
-      cpuCapacity: Number.MIN_VALUE,
-      startedAt: 0,
-    });
-    const samples = appendRuntimeTrendSample(
-      appendRuntimeTrendSample([], cumulative(60_000, 0)),
-      cumulative(120_000, Number.MAX_VALUE),
-    );
-    expect(cpuTarget(samples.at(-1))?.cpuRatio ?? null).toBeNull();
-  });
-
-  it("leaves a gap while a Session's public usage is null and spreads the next report", () => {
-    const pending = (at: number) => {
-      const value = snapshot(at);
-      value.sessions[0] = { ...value.sessions[0]!, status: "in_progress", usage: null };
-      return value;
-    };
-    let samples = appendRuntimeTrendSample([], snapshot(60_000, { input: 100, output: 20 }));
-    samples = appendRuntimeTrendSample(samples, pending(120_000));
-    // The held total keeps its report time and is never a zero-rate measurement.
-    expect(samples.at(-1)?.tokenTotals).toEqual([{
-      sessionId: "11111111-1111-4111-8111-111111111111", sampledAt: 60_000, inputTokens: 100, outputTokens: 20, held: true,
-    }]);
-    samples = appendRuntimeTrendSample(samples, pending(180_000));
-    samples = appendRuntimeTrendSample(samples, snapshot(240_000, { input: 400, output: 80 }));
-    samples = appendRuntimeTrendSample(samples, snapshot(300_000, { input: 460, output: 90 }));
-    expect(tokenThroughput(samples)).toEqual([
-      { sampledAt: 60_000, inputPerMinute: null, outputPerMinute: null },
-      { sampledAt: 120_000, inputPerMinute: null, outputPerMinute: null },
-      { sampledAt: 180_000, inputPerMinute: null, outputPerMinute: null },
-      // 300 input and 60 output tokens over the three minutes since the last report.
-      { sampledAt: 240_000, inputPerMinute: 100, outputPerMinute: 20 },
-      { sampledAt: 300_000, inputPerMinute: 60, outputPerMinute: 10 },
-    ]);
-  });
-
-  it("keeps Session-set churn as a gap instead of publishing partial throughput", () => {
-    const first = snapshot(60_000, { input: 100, output: 20 });
-    const second = snapshot(120_000, { input: 220, output: 50 });
-    second.sessions.push({
-      ...second.sessions[0]!,
-      id: "22222222-2222-4222-8222-222222222222",
-      usage: { ...second.sessions[0]!.usage!, input_tokens: 5_000, output_tokens: 800, total_tokens: 5_800 },
-    });
-    const third = snapshot(180_000, { input: 250, output: 10 });
-    let samples = appendRuntimeTrendSample([], first);
-    samples = appendRuntimeTrendSample(samples, second);
-    samples = appendRuntimeTrendSample(samples, third);
-    expect(tokenThroughput(samples)).toEqual([
-      { sampledAt: 60_000, inputPerMinute: null, outputPerMinute: null },
-      { sampledAt: 120_000, inputPerMinute: null, outputPerMinute: null },
-      { sampledAt: 180_000, inputPerMinute: null, outputPerMinute: null },
-    ]);
-  });
-
-  it("bounds retained target detail and keeps raw token counters only for the latest sample", () => {
-    const many = snapshot(60_000);
-    many.sessions = Array.from({ length: 20 }, (_, index) => ({
-      ...many.sessions[0]!,
-      id: `session-${index}`,
-      metadata: { title: `Runtime ${index}` },
-    }));
-    many.observations = many.sessions.map((session, index) => ({
-      ...many.observations[0]!,
-      id: session.id,
-      session_id: session.id,
-      instance: { ...many.observations[0]!.instance, allocation_id: `allocation-${index}` },
-      cpu: { ...many.observations[0]!.cpu!, utilization_ratio: index / 10 },
-      started_at: 60 - index,
-    } as RuntimeObservation));
-    const later = { ...many, loadedAt: 120_000 };
-    let samples = appendRuntimeTrendSample([], many);
-    samples = appendRuntimeTrendSample(samples, later);
-    expect(samples.every((sample) => sample.targets.length <= RUNTIME_TREND_MAX_TARGETS)).toBe(true);
-    expect(samples[0]?.cpuCandidates).toEqual([]);
-    expect(samples[1]?.cpuCandidates).toHaveLength(20);
-    expect(samples[0]?.tokenTotals).toEqual([]);
-    expect(samples[1]?.tokenTotals).toHaveLength(20);
-  });
-});
diff --git a/apps/web/src/features/dashboard/runtime-trends.ts b/apps/web/src/features/dashboard/runtime-trends.ts
index e8500e760..c6b245f1e 100644
--- a/apps/web/src/features/dashboard/runtime-trends.ts
+++ b/apps/web/src/features/dashboard/runtime-trends.ts
@@ -1,38 +1,13 @@
-import type { AgentSession, RuntimeObservation } from "@oac/agents-client";
-
-import { holdLastReported } from "./held-usage";
-import type { RuntimeDashboardSnapshot } from "./runtime-snapshot";
-
-export const RUNTIME_TREND_WINDOW_MS = 60 * 60 * 1_000;
-export const RUNTIME_TREND_MAX_SAMPLES = 120;
-export const RUNTIME_TREND_SERIES_LIMIT = 3;
-export const RUNTIME_TREND_MAX_TARGETS = RUNTIME_TREND_SERIES_LIMIT * 2;
-export const RUNTIME_TREND_RANGES = [
-  { label: "15m", milliseconds: 15 * 60 * 1_000 },
-  { label: "1h", milliseconds: RUNTIME_TREND_WINDOW_MS },
-] as const;
-export type RuntimeTrendRange = typeof RUNTIME_TREND_RANGES[number]["milliseconds"];
-
 export interface RuntimeTrendTarget {
   seriesId: string;
   label: string;
   cpuRatio: number | null;
 }
 
-export interface RuntimeTrendCPUCandidate extends RuntimeTrendTarget {
-  observedAt: number | null;
-  startedAt: number | null;
-  allocationKey: string | null;
-  usageSecondsTotal: number | null;
-  capacityCores: number | null;
-  reportedRatio: number | null;
-}
-
 export interface RuntimeTrendSample {
   sampledAt: number;
   activeSandboxCount: number | null;
   targets: RuntimeTrendTarget[];
-  cpuCandidates: RuntimeTrendCPUCandidate[];
   memoryUsageBytes: number | null;
   memoryLimitBytes: number | null;
   tokenTotals: RuntimeTrendTokenTotal[];
@@ -45,199 +20,6 @@ export interface RuntimeTrendTokenTotal {
   sampledAt: number;
   inputTokens: number;
   outputTokens: number;
-  /** Kept from the report at sampledAt while public Session usage is null. */
-  held?: true;
-}
-
-export interface TokenThroughputSample {
-  sampledAt: number;
-  inputPerMinute: number | null;
-  outputPerMinute: number | null;
-}
-
-function finiteNonNegative(value: unknown): number | null {
-  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
-}
-
-function safeInteger(value: unknown): number | null {
-  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
-}
-
-function sessionTitle(session: AgentSession): string {
-  const title = session.metadata?.title;
-  if (typeof title === "string" && title.length > 0) return title;
-  return session.agent.name ?? session.agent.model;
-}
-
-function reportedCpuRatio(observation: RuntimeObservation): number | null {
-  if (observation.status !== "observed") return null;
-  const reported = finiteNonNegative(observation.cpu?.utilization_ratio);
-  if (reported !== null) return reported;
-  const usage = finiteNonNegative(observation.cpu?.usage_cores);
-  const capacity = finiteNonNegative(observation.cpu?.capacity_cores);
-  return usage !== null && capacity !== null && capacity > 0
-    ? finiteNonNegative(usage / capacity)
-    : null;
-}
-
-function allocationKey(observation: RuntimeObservation): string | null {
-  if (observation.mode !== "openai_hosted") return null;
-  const allocationId = observation.instance.allocation_id;
-  return typeof allocationId === "string" && allocationId.length > 0
-    ? `${observation.instance.kind}:${allocationId}`
-    : null;
-}
-
-function tokenTotals(sessions: readonly AgentSession[], sampledAt: number): RuntimeTrendTokenTotal[] {
-  return sessions.flatMap((session): RuntimeTrendTokenTotal[] => {
-    const inputTokens = safeInteger(session.usage?.input_tokens);
-    const outputTokens = safeInteger(session.usage?.output_tokens);
-    return inputTokens === null || outputTokens === null
-      ? []
-      : [{ sessionId: session.id, sampledAt, inputTokens, outputTokens }];
-  });
-}
-
-// Keep a listed Session's last reported totals, with their report time, while
-// its public usage is null. tokenRate treats a held total as unknown, so those
-// intervals are gaps; the next reported total is spread over the time since the
-// last report.
-function carryTokenTotals(previous: RuntimeTrendSample, next: RuntimeTrendSample, snapshot: RuntimeDashboardSnapshot): void {
-  const reported = new Map<string, RuntimeTrendTokenTotal | null>(snapshot.sessions.map((session) => [session.id, null]));
-  for (const total of next.tokenTotals) reported.set(total.sessionId, total);
-  const prior = new Map(previous.tokenTotals.map((total) => [total.sessionId, { ...total, held: true as const }]));
-  next.tokenTotals = [...holdLastReported(prior, reported).values()];
-}
-
-export function runtimeTrendSample(snapshot: RuntimeDashboardSnapshot): RuntimeTrendSample {
-  const sessions = new Map(snapshot.sessions.map((session) => [session.id, session]));
-  const managed = snapshot.observations.flatMap((observation) => {
-    const session = sessions.get(observation.session_id);
-    if (!session || observation.mode !== "openai_hosted") return [];
-    const key = allocationKey(observation);
-    const allocationId = observation.instance.allocation_id;
-    if (key === null || typeof allocationId !== "string" || allocationId.length === 0) return [];
-    return [{
-      seriesId: `${observation.session_id}:${key}`,
-      allocationId,
-      label: sessionTitle(session),
-      cpuRatio: reportedCpuRatio(observation),
-      resolvedAt: safeInteger(observation.resolved_at),
-      observedAt: safeInteger(observation.observed_at),
-      startedAt: safeInteger(observation.started_at),
-      allocationKey: allocationKey(observation),
-      usageSecondsTotal: finiteNonNegative(observation.cpu?.usage_seconds_total),
-      capacityCores: finiteNonNegative(observation.cpu?.capacity_cores),
-      memoryUsageBytes: finiteNonNegative(observation.memory?.usage_bytes),
-      memoryLimitBytes: finiteNonNegative(observation.memory?.limit_bytes),
-      lifecycleState: observation.lifecycle_state,
-      observed: observation.status === "observed",
-    }];
-  });
-  const latestByAllocation = new Map<string, typeof managed[number]>();
-  for (const target of managed) {
-    const previous = latestByAllocation.get(target.allocationId);
-    if (!previous || (target.resolvedAt ?? -1) >= (previous.resolvedAt ?? -1)) {
-      latestByAllocation.set(target.allocationId, target);
-    }
-  }
-  const allocations = [...latestByAllocation.values()];
-  const latestObservedByAllocation = new Map<string, typeof managed[number]>();
-  for (const target of managed) {
-    if (!target.observed) continue;
-    const previous = latestObservedByAllocation.get(target.allocationId);
-    if (!previous || (target.observedAt ?? -1) >= (previous.observedAt ?? -1)) {
-      latestObservedByAllocation.set(target.allocationId, target);
-    }
-  }
-  const observed = [...latestObservedByAllocation.values()];
-  const targets: RuntimeTrendTarget[] = observed.filter((target) => target.cpuRatio !== null)
-    .sort((left, right) => (right.cpuRatio ?? 0) - (left.cpuRatio ?? 0))
-    .slice(0, RUNTIME_TREND_SERIES_LIMIT)
-    .map((target) => ({
-      seriesId: target.seriesId,
-      label: target.label,
-      cpuRatio: target.cpuRatio,
-    }));
-  const pairedMemory = observed.filter((target) => (
-    target.memoryUsageBytes !== null && target.memoryLimitBytes !== null
-  ));
-  return {
-    sampledAt: snapshot.loadedAt,
-    activeSandboxCount: allocations.filter((target) => target.lifecycleState === "active").length,
-    targets,
-    cpuCandidates: observed.flatMap((target): RuntimeTrendCPUCandidate[] => (
-      target.seriesId !== null && (target.cpuRatio !== null || (
-        target.observedAt !== null && target.allocationKey !== null &&
-        target.usageSecondsTotal !== null && target.capacityCores !== null && target.capacityCores > 0
-      ))
-        ? [{
-          seriesId: target.seriesId!,
-          label: target.label,
-          cpuRatio: target.cpuRatio,
-          observedAt: target.observedAt,
-          startedAt: target.startedAt,
-          allocationKey: target.allocationKey,
-          usageSecondsTotal: target.usageSecondsTotal,
-          capacityCores: target.capacityCores,
-          reportedRatio: target.cpuRatio,
-        }]
-        : []
-    )),
-    memoryUsageBytes: pairedMemory.length === 0
-      ? null
-      : pairedMemory.reduce((total, target) => total + (target.memoryUsageBytes ?? 0), 0),
-    memoryLimitBytes: pairedMemory.length === 0
-      ? null
-      : pairedMemory.reduce((total, target) => total + (target.memoryLimitBytes ?? 0), 0),
-    tokenTotals: tokenTotals(snapshot.sessions, snapshot.loadedAt),
-    inputTokensPerMinute: null,
-    outputTokensPerMinute: null,
-  };
-}
-
-function cpuRatios(previous: RuntimeTrendSample, next: RuntimeTrendSample): Map<string, number> {
-  const previousCandidates = new Map(previous.cpuCandidates.map((candidate) => [candidate.seriesId, candidate]));
-  const ratios = new Map<string, number>();
-  for (const current of next.cpuCandidates) {
-    const prior = previousCandidates.get(current.seriesId);
-    if (current.reportedRatio !== null && !prior) {
-      ratios.set(current.seriesId, current.reportedRatio);
-      continue;
-    }
-    if (
-      !prior || prior.allocationKey === null || prior.allocationKey !== current.allocationKey ||
-      prior.observedAt === null || current.observedAt === null || current.observedAt <= prior.observedAt
-    ) continue;
-    if (current.reportedRatio !== null) {
-      ratios.set(current.seriesId, current.reportedRatio);
-      continue;
-    }
-    if (
-      prior.startedAt === null || current.startedAt === null || prior.startedAt !== current.startedAt ||
-      prior.usageSecondsTotal === null || current.usageSecondsTotal === null ||
-      current.usageSecondsTotal < prior.usageSecondsTotal ||
-      current.capacityCores === null || current.capacityCores <= 0
-    ) continue;
-    const usageCores = (current.usageSecondsTotal - prior.usageSecondsTotal) /
-      (current.observedAt - prior.observedAt);
-    const ratio = finiteNonNegative(usageCores / current.capacityCores);
-    if (ratio !== null) ratios.set(current.seriesId, ratio);
-  }
-  return ratios;
-}
-
-function applyCPURatios(sample: RuntimeTrendSample, ratios: ReadonlyMap<string, number>): void {
-  const cpu = sample.cpuCandidates.flatMap((candidate): RuntimeTrendTarget[] => {
-    const ratio = ratios.get(candidate.seriesId);
-    return ratio === undefined ? [] : [{
-      seriesId: candidate.seriesId,
-      label: candidate.label,
-      cpuRatio: ratio,
-    }];
-  }).sort((left, right) => (right.cpuRatio ?? 0) - (left.cpuRatio ?? 0))
-    .slice(0, RUNTIME_TREND_SERIES_LIMIT);
-  sample.targets = cpu;
 }
 
 function tokenRate(
@@ -253,17 +35,15 @@ function tokenRate(
     const prior = previousTotals.get(current.sessionId);
     return prior ? [[prior, current]] : [];
   });
-  // A total held from an earlier report is not a measurement at this sample.
-  const measured = (current: RuntimeTrendTokenTotal) => !current.held;
   const inputRates = pairs.map(([prior, current]) => {
     const elapsedMinutes = (current.sampledAt - prior.sampledAt) / 60_000;
     const delta = current.inputTokens - prior.inputTokens;
-    return measured(current) && elapsedMinutes > 0 && delta >= 0 ? delta / elapsedMinutes : null;
+    return elapsedMinutes > 0 && delta >= 0 ? delta / elapsedMinutes : null;
   });
   const outputRates = pairs.map(([prior, current]) => {
     const elapsedMinutes = (current.sampledAt - prior.sampledAt) / 60_000;
     const delta = current.outputTokens - prior.outputTokens;
-    return measured(current) && elapsedMinutes > 0 && delta >= 0 ? delta / elapsedMinutes : null;
+    return elapsedMinutes > 0 && delta >= 0 ? delta / elapsedMinutes : null;
   });
   const inputRate = inputRates.length > 0 && inputRates.every((rate) => rate !== null)
     ? inputRates.reduce<number>((total, rate) => total + (rate ?? 0), 0)
@@ -285,45 +65,3 @@ export function deriveTokenThroughput(samples: readonly RuntimeTrendSample[]): R
     return current;
   });
 }
-
-export function appendRuntimeTrendSample(
-  current: readonly RuntimeTrendSample[],
-  snapshot: RuntimeDashboardSnapshot,
-  windowMs = RUNTIME_TREND_WINDOW_MS,
-  maximum = RUNTIME_TREND_MAX_SAMPLES,
-): RuntimeTrendSample[] {
-  const next = runtimeTrendSample(snapshot);
-  const retained = current
-    .filter((sample) => sample.sampledAt !== next.sampledAt)
-    .filter((sample) => sample.sampledAt >= next.sampledAt - windowMs && sample.sampledAt <= next.sampledAt)
-    .sort((left, right) => left.sampledAt - right.sampledAt)
-    .slice(-(maximum - 1));
-  const previous = retained.at(-1);
-  if (previous) {
-    carryTokenTotals(previous, next, snapshot);
-    Object.assign(next, tokenRate(previous, next));
-    applyCPURatios(next, cpuRatios(previous, next));
-  }
-  return [
-    ...retained.map((sample) => ({ ...sample, cpuCandidates: [], tokenTotals: [] })),
-    next,
-  ].slice(-maximum);
-}
-
-export function tokenThroughput(samples: readonly RuntimeTrendSample[]): TokenThroughputSample[] {
-  return samples.map((sample) => ({
-    sampledAt: sample.sampledAt,
-    inputPerMinute: sample.inputTokensPerMinute,
-    outputPerMinute: sample.outputTokensPerMinute,
-  }));
-}
-
-export function runtimeTrendRange(
-  samples: readonly RuntimeTrendSample[],
-  range: RuntimeTrendRange,
-): RuntimeTrendSample[] {
-  const newest = samples.at(-1)?.sampledAt;
-  if (newest === undefined) return [];
-  const start = newest - range;
-  return samples.filter((sample) => sample.sampledAt >= start && sample.sampledAt <= newest);
-}
diff --git a/apps/web/src/features/environment-templates/TemplatesPage.test.tsx b/apps/web/src/features/environment-templates/TemplatesPage.test.tsx
index 748231f92..9faa4ef8a 100644
--- a/apps/web/src/features/environment-templates/TemplatesPage.test.tsx
+++ b/apps/web/src/features/environment-templates/TemplatesPage.test.tsx
@@ -1,5 +1,5 @@
 import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 import type { EnvironmentTemplate, EnvironmentTemplateResource } from "@oac/agents-client";
 import { filterTemplates } from "./template-name";
 import { TemplateDetailPage, skillVersionLabel } from "./TemplateDetail";
diff --git a/apps/web/src/features/environment-templates/TemplatesPage.tsx b/apps/web/src/features/environment-templates/TemplatesPage.tsx
index 644846134..07bdd64d0 100644
--- a/apps/web/src/features/environment-templates/TemplatesPage.tsx
+++ b/apps/web/src/features/environment-templates/TemplatesPage.tsx
@@ -11,7 +11,7 @@ import { useConsoleNavigation } from "../../lib/console-navigation";
 import { coreError } from "../../lib/core-error";
 import { useDeleteFlow } from "../../lib/delete-flow";
 import { formatDateTime, MISSING } from "../../lib/format";
-import { CreatorCell, CreatorHeading, forgetCreators, ProjectFilter, ProjectName, projectClient, readAllPages, useCreators, useProjectCollection, useProjects, type Owned } from "../../lib/projects";
+import { CreatorCell, CreatorHeading, forgetCreators, ProjectFilter, ProjectName, projectClient, useCreators, useProjectCollection, useProjects, type Owned } from "../../lib/projects";
 import { TemplateDetailPage } from "./TemplateDetail";
 import { filterTemplates, templateName } from "./template-name";
 import "./EnvironmentTemplatesView.css";
diff --git a/apps/web/src/features/files/FilesPage.tsx b/apps/web/src/features/files/FilesPage.tsx
index 4703b3e82..3b2c01b15 100644
--- a/apps/web/src/features/files/FilesPage.tsx
+++ b/apps/web/src/features/files/FilesPage.tsx
@@ -10,7 +10,7 @@ import { ListToolbar, listSummary, NameCell, RowActions, SearchField } from "../
 import { useConsoleNavigation } from "../../lib/console-navigation";
 import { useDeleteFlow } from "../../lib/delete-flow";
 import { formatBytes, formatDateTime, MISSING } from "../../lib/format";
-import { CreatorCell, CreatorHeading, forgetCreators, ProjectFilter, ProjectName, projectClient, readAllPages, useCreators, useProjectCollection, useProjects, type Owned } from "../../lib/projects";
+import { CreatorCell, CreatorHeading, forgetCreators, ProjectFilter, ProjectName, projectClient, useCreators, useProjectCollection, useProjects, type Owned } from "../../lib/projects";
 import { filesPageSize, filterFiles, isUnrecognizedFile } from "./file-operations";
 import "./files.css";
 import { filesCollection } from "../../lib/queries";
diff --git a/apps/web/src/features/files/file-operations.test.ts b/apps/web/src/features/files/file-operations.test.ts
index 90fecd4e0..1136e3f00 100644
--- a/apps/web/src/features/files/file-operations.test.ts
+++ b/apps/web/src/features/files/file-operations.test.ts
@@ -1,13 +1,8 @@
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 
 import type { SourceFile, SourceFileListEntry } from "@oac/agents-client";
 
-import {
-  filterFiles,
-  maxFileUploadBytes,
-  readFilesPage,
-  uploadPrecheck,
-} from "./file-operations";
+import { filterFiles } from "./file-operations";
 
 function file(id: string, filename: string, created = 1_790_208_000): SourceFile {
   return {
@@ -20,24 +15,6 @@ const notes = file("file-16e1f26e-8cf6-4272-9c31-d470b08d31af", "notes.txt");
 const input = file("file-2b7c9d10-4e5f-4a6b-8c7d-9e0f1a2b3c4d", "Input.CSV");
 const unknown: SourceFileListEntry = { id: "file-3c8d0e21-5f60-4b7c-9d8e-0f1a2b3c4d5e", object: "file", unrecognized: true };
 
-describe("upload precheck", () => {
-  it("accepts an empty file and the 512 MiB bound", () => {
-    expect(uploadPrecheck({ name: "empty.bin", size: 0 })).toBeNull();
-    expect(uploadPrecheck({ name: "big.bin", size: maxFileUploadBytes })).toBeNull();
-  });
-
-  it("rejects oversized files before sending", () => {
-    expect(uploadPrecheck({ name: "big.bin", size: maxFileUploadBytes + 1 })).toBe("too-large");
-  });
-
-  it("bounds the name to 1–1024 UTF-8 bytes without NUL", () => {
-    expect(uploadPrecheck({ name: "", size: 1 })).toBe("bad-name");
-    expect(uploadPrecheck({ name: "a\0b", size: 1 })).toBe("bad-name");
-    expect(uploadPrecheck({ name: "é".repeat(512), size: 1 })).toBeNull();
-    expect(uploadPrecheck({ name: "é".repeat(513), size: 1 })).toBe("bad-name");
-  });
-});
-
 describe("loaded-row filter", () => {
   it("matches file names and IDs case-insensitively", () => {
     expect(filterFiles([notes, input, unknown], "csv")).toEqual([input]);
@@ -45,26 +22,3 @@ describe("loaded-row filter", () => {
     expect(filterFiles([notes, input, unknown], "  ")).toEqual([notes, input, unknown]);
   });
 });
-
-describe("pagination", () => {
-  it("reads 100 at a time with the chosen order and appends the next page", async () => {
-    const listSourceFiles = vi.fn()
-      .mockResolvedValueOnce({ object: "list", data: [notes], has_more: true, first_id: notes.id, last_id: notes.id })
-      .mockResolvedValueOnce({ object: "list", data: [input], has_more: false, first_id: input.id, last_id: input.id });
-
-    const first = await readFilesPage({ listSourceFiles }, [], "asc", undefined);
-    const second = await readFilesPage({ listSourceFiles }, first.values, "asc", first.nextAfter ?? undefined);
-
-    expect(listSourceFiles.mock.calls.map(([options]) => options)).toEqual([
-      { limit: 100, order: "asc", after: undefined, signal: undefined },
-      { limit: 100, order: "asc", after: notes.id, signal: undefined },
-    ]);
-    expect(first.nextAfter).toBe(notes.id);
-    expect(second).toEqual({ values: [notes, input], nextAfter: null });
-  });
-
-  it("rejects a page that repeats a loaded File", async () => {
-    const listSourceFiles = vi.fn().mockResolvedValue({ object: "list", data: [notes], has_more: false, first_id: notes.id, last_id: notes.id });
-    await expect(readFilesPage({ listSourceFiles }, [notes], "desc", notes.id)).rejects.toThrow("duplicate");
-  });
-});
diff --git a/apps/web/src/features/files/file-operations.ts b/apps/web/src/features/files/file-operations.ts
index c4edbf02a..c1b880057 100644
--- a/apps/web/src/features/files/file-operations.ts
+++ b/apps/web/src/features/files/file-operations.ts
@@ -1,23 +1,9 @@
-import type { PageOrder, SourceFileListEntry } from "@oac/agents-client";
+import type { SourceFileListEntry } from "@oac/agents-client";
 
-import type { ProjectClient } from "../../lib/projects";
-import { appendCollectionPage } from "../../lib/collection-pagination";
 
-/** Core's single-upload bound for user_data Files. */
-export const maxFileUploadBytes = 512 * 1024 * 1024;
 /** One page of the Files list; Core allows up to 10000, but the console reads 100 at a time. */
 export const filesPageSize = 100;
 
-export type UploadPrecheck = "too-large" | "bad-name" | null;
-
-/** Browser checks before any byte is sent; Core still validates the upload. */
-export function uploadPrecheck(file: { name: string; size: number }): UploadPrecheck {
-  if (!Number.isSafeInteger(file.size) || file.size < 0 || file.size > maxFileUploadBytes) return "too-large";
-  const nameBytes = new TextEncoder().encode(file.name).length;
-  if (nameBytes < 1 || nameBytes > 1024 || file.name.includes("\0")) return "bad-name";
-  return null;
-}
-
 export function isUnrecognizedFile(entry: SourceFileListEntry): entry is Extract<SourceFileListEntry, { unrecognized: true }> {
   return entry.unrecognized === true;
 }
@@ -29,15 +15,3 @@ export function filterFiles(files: readonly SourceFileListEntry[], query: string
   return files.filter((file) => file.id.toLocaleLowerCase().includes(needle) ||
     (!isUnrecognizedFile(file) && file.filename.toLocaleLowerCase().includes(needle)));
 }
-
-/** Reads one page after the loaded rows and applies the shared identity and cursor checks. */
-export async function readFilesPage(
-  core: Pick<ProjectClient, "listSourceFiles">,
-  loaded: readonly SourceFileListEntry[],
-  order: PageOrder,
-  after: string | undefined,
-  signal?: AbortSignal,
-): Promise<{ values: SourceFileListEntry[]; nextAfter: string | null }> {
-  const page = await core.listSourceFiles({ limit: filesPageSize, order, after, signal });
-  return appendCollectionPage(loaded, page, after);
-}
diff --git a/apps/web/src/features/metrics/project-sessions.ts b/apps/web/src/features/metrics/project-sessions.ts
index fa8344f1e..78fecce83 100644
--- a/apps/web/src/features/metrics/project-sessions.ts
+++ b/apps/web/src/features/metrics/project-sessions.ts
@@ -66,7 +66,3 @@ export async function readProjectsSessions(
   });
   return { reads, failures };
 }
-
-export function isAbortError(error: unknown): boolean {
-  return error instanceof DOMException && error.name === "AbortError";
-}
diff --git a/apps/web/src/features/overview/overview.css b/apps/web/src/features/overview/overview.css
index 8af743313..294ac3736 100644
--- a/apps/web/src/features/overview/overview.css
+++ b/apps/web/src/features/overview/overview.css
@@ -318,15 +318,6 @@
   border-bottom-color: var(--line-muted);
 }
 
-.overview-projects-table .column-group {
-  text-align: center;
-}
-
-.overview-projects-table .column-group,
-.overview-projects-table .column-group-start {
-  box-shadow: inset 1px 0 var(--line-muted);
-}
-
 /* The project column fits its names; spare width spreads over the figures
    instead of opening a gap between a project and its numbers. */
 .overview-projects-table thead tr:first-child > th:first-child,
diff --git a/apps/web/src/features/sandbox/SandboxManagerView.css b/apps/web/src/features/sandbox/SandboxManagerView.css
index 6aaa8c9e8..040183aa9 100644
--- a/apps/web/src/features/sandbox/SandboxManagerView.css
+++ b/apps/web/src/features/sandbox/SandboxManagerView.css
@@ -10,7 +10,6 @@
 .sandbox-summary dt { font-size: 12px; color: var(--ink-3); margin-bottom: 4px; }
 .sandbox-summary dd { margin: 0; color: var(--ink); font-size: 13px; overflow-wrap: anywhere; }
 .sandbox-error { color: var(--danger) !important; }
-.sandbox-enrollment { max-width: 580px; padding: 24px; border: 1px solid var(--line); border-radius: 12px; }
 .sandbox-command { min-width: 0; border: 1px solid var(--line); border-radius: 8px; overflow: hidden; background: var(--surface); }
 .sandbox-command-heading { display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 9px 12px; border-bottom: 1px solid var(--line); }
 .sandbox-command-heading > span { display: inline-flex; align-items: center; gap: 7px; color: var(--fg-muted); font-size: 12px; }
@@ -23,15 +22,12 @@
 .sandbox-notice { padding: 12px 16px; border: 1px solid var(--line); border-radius: 8px; font-size: 13px; }
 @media (max-width: 600px) {
   .sandbox-manager { padding: 22px 14px; }
-  .sandbox-enrollment { padding: 18px; }
 }
 
 /* The node manager page uses the shared console header and body rhythm. */
 .sandbox-manager-page { display: flex; padding: 0; overflow: hidden; }
 .sandbox-manager-page > .console-page-body { max-width: none; margin: 0; }
 .sandbox-manager-page .page-header h1 { margin: 0; }
-.sandbox-enrollment > p { font-size: 13px; line-height: 1.6; color: var(--fg-muted); }
-.sandbox-enrollment > .button { align-self: flex-start; }
 
 /* Node list and node detail. */
 .nodes-nowrap { white-space: nowrap; }
@@ -89,10 +85,4 @@
 .sandbox-reset-options input[type="number"] { max-width: 180px; }
 .sandbox-reset-dialog p { line-height: 1.6; }
 
-/* Shared rollout summaries keep target facts ahead of the secondary node partition. */
-.sandbox-rollout { min-width: 0; gap: 12px; }
-.sandbox-rollout h3 { margin: 0; font-size: 13px; font-weight: 600; }
-.sandbox-rollout p { margin: 0; font-size: 13px; color: var(--fg-muted); }
-.sandbox-rollout > .text-action { align-self: flex-start; }
-
 .node-statuses { display: grid; gap: 4px; }
diff --git a/apps/web/src/features/sandbox/sandbox-queries.ts b/apps/web/src/features/sandbox/sandbox-queries.ts
index 81029f64e..6125b7690 100644
--- a/apps/web/src/features/sandbox/sandbox-queries.ts
+++ b/apps/web/src/features/sandbox/sandbox-queries.ts
@@ -1,5 +1,5 @@
-import { SandboxAdminClient, type SandboxAllocation, type SandboxDeployment, type SandboxNode, type SandboxProvider } from "@oac/agents-client";
-import { queryOptions, useQuery } from "@tanstack/react-query";
+import { SandboxAdminClient, type SandboxAllocation, type SandboxDeployment, type SandboxNode } from "@oac/agents-client";
+import { queryOptions } from "@tanstack/react-query";
 
 import { confirmSandboxRead, startSandboxRead } from "./sandbox-write-ownership";
 import { sandboxConsoleConfig } from "./console-config";
@@ -43,15 +43,6 @@ export function sandboxResetPollInterval(deployment: SandboxDeployment | undefin
   return deployment?.reset || deployment?.rollout.state === "preparing" ? 5000 : false;
 }
 
-/**
- * The deployment's sandbox provider from the cached deployment read: "" before
- * setup, null while unknown. Pages that differ for E2B (no machines) and own
- * nodes read it.
- */
-export function useSandboxProvider(): SandboxProvider | "" | null {
-  return useQuery(sandboxDeploymentQuery).data?.provider ?? null;
-}
-
 export interface SandboxSnapshot {
   deployment: SandboxDeployment;
   nodes: SandboxNode[];
diff --git a/apps/web/src/features/sandbox/sandbox-wizard.css b/apps/web/src/features/sandbox/sandbox-wizard.css
index a10af5622..4810db71b 100644
--- a/apps/web/src/features/sandbox/sandbox-wizard.css
+++ b/apps/web/src/features/sandbox/sandbox-wizard.css
@@ -259,14 +259,6 @@
   font-size: 13px;
 }
 
-.wizard-missing {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  color: var(--orange);
-  font-weight: 500;
-}
-
 @media (max-width: 640px) {
   .wizard-choices-3 {
     grid-template-columns: minmax(0, 1fr);
diff --git a/apps/web/src/features/sessions/sessions.css b/apps/web/src/features/sessions/sessions.css
index de0641b66..0369ccd08 100644
--- a/apps/web/src/features/sessions/sessions.css
+++ b/apps/web/src/features/sessions/sessions.css
@@ -320,14 +320,6 @@
   letter-spacing: inherit;
 }
 
-/* Runtime charts are divided by hairlines inside one frame. */
-.session-runtime-charts {
-  min-width: 0;
-  overflow: hidden;
-  border: 1px solid var(--line);
-  border-radius: var(--frame-radius);
-}
-
 /* The order strip's explanation sits beside its label, behind the help tip. */
 .session-trace-frame .trace-order-overview > header {
   align-items: center;
@@ -513,50 +505,6 @@
   line-height: 18px;
 }
 
-.executor-install-skeleton {
-  display: grid;
-  gap: 10px;
-  padding: 14px 12px;
-}
-
-.executor-install-skeleton .skeleton-bar:first-child {
-  width: 62%;
-}
-
-.executor-install-skeleton .skeleton-bar:last-child {
-  width: 48%;
-}
-
-/* Host requirements on one wrapping line, split by middle dots. */
-.executor-install-requirements {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 2px 8px;
-  color: var(--fg-muted);
-  font-size: 12.5px;
-  line-height: 18px;
-}
-
-.executor-install-requirements > span {
-  color: var(--fg);
-  font-weight: 500;
-}
-
-.executor-install-requirements ul {
-  display: flex;
-  flex: 1 1 0;
-  flex-wrap: wrap;
-  gap: 2px 8px;
-  min-width: 0;
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-
-.executor-install-separator {
-  margin-right: 8px;
-}
-
 /* A failure's reason under its status: in full under a failed Turn, its line
    breaks kept; one truncated line in the Session log, with the full text in
    its tooltip. */
diff --git a/apps/web/src/features/sessions/trace/TraceView.tsx b/apps/web/src/features/sessions/trace/TraceView.tsx
index afd4f871a..11f0dd09f 100644
--- a/apps/web/src/features/sessions/trace/TraceView.tsx
+++ b/apps/web/src/features/sessions/trace/TraceView.tsx
@@ -84,14 +84,6 @@ function formatDuration(milliseconds: number, locale = "en-US"): string {
   return `${minutes}m ${String(remainder).padStart(2, "0")}s`;
 }
 
-function formatTimestamp(seconds: number | null | undefined, locale: string, unknown: string): string {
-  if (typeof seconds !== "number" || !Number.isSafeInteger(seconds) || seconds < 0) return unknown;
-  const timestamp = new Date(seconds * 1_000);
-  return Number.isNaN(timestamp.getTime())
-    ? unknown
-    : new Intl.DateTimeFormat(locale, { dateStyle: "medium", timeStyle: "medium" }).format(timestamp);
-}
-
 function itemStatusKind(status: TraceRow["status"]): StatusKind {
   if (status === "in_progress") return "running";
   if (status === "failed") return "failed";
@@ -115,11 +107,6 @@ function rowIcon(row: TraceRow): ReactNode {
   return <FileJson size={14} strokeWidth={1.5} aria-hidden="true" />;
 }
 
-function valueLabel<T>(value: TraceValue<T>, t: Translate, format: (available: T) => string = String): string {
-  if (value.state === "available" && value.value !== null) return format(value.value);
-  return value.state === "unknown" ? t("common.unknown") : t("common.unavailable");
-}
-
 function rowDurationPresentation(value: TraceValue<number>, t: Translate, locale: string): {
   visible: string;
   assistive: string;
@@ -147,11 +134,6 @@ function rowDurationPresentation(value: TraceValue<number>, t: Translate, locale
   };
 }
 
-function durationDetailLabel(value: TraceValue<number>, t: Translate, locale: string): string {
-  if (value.state === "available" && value.value !== null) return formatDuration(value.value, locale);
-  return value.state === "unknown" ? t("common.unknown") : t("trace.notProvidedByCore");
-}
-
 function turnDurationLabel(value: TraceValue<number>, t: Translate, locale: string): string {
   if (value.state === "available" && value.value !== null) return t("trace.turnDuration", { duration: formatDuration(value.value, locale) });
   return value.state === "unknown" ? t("trace.turnTimeUnknown") : t("trace.turnTimeNotProvided");
diff --git a/apps/web/src/features/skills/SkillDetail.test.tsx b/apps/web/src/features/skills/SkillDetail.test.tsx
index fa3651a85..2628efbd7 100644
--- a/apps/web/src/features/skills/SkillDetail.test.tsx
+++ b/apps/web/src/features/skills/SkillDetail.test.tsx
@@ -1,7 +1,7 @@
 import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 
-import type { Skill, SkillVersion, SkillVersionList } from "@oac/agents-client";
+import type { Skill, SkillVersion } from "@oac/agents-client";
 
 import { SkillDetailPage, type SkillDetailPageProps, type SkillVersionsState } from "./SkillDetail";
 
diff --git a/apps/web/src/features/skills/SkillsPage.tsx b/apps/web/src/features/skills/SkillsPage.tsx
index b3aea2b5c..52dc6456f 100644
--- a/apps/web/src/features/skills/SkillsPage.tsx
+++ b/apps/web/src/features/skills/SkillsPage.tsx
@@ -24,7 +24,7 @@ import { TableSkeleton } from "../../components/Skeleton";
  * keys.
  */
 export function SkillsPage() {
-  const { params, navigate, back } = useConsoleNavigation();
+  const { params, back } = useConsoleNavigation();
 
   if (params.project && params.id) {
     return (
diff --git a/apps/web/src/features/skills/skill-operations.test.ts b/apps/web/src/features/skills/skill-operations.test.ts
index 735538e08..026f638f4 100644
--- a/apps/web/src/features/skills/skill-operations.test.ts
+++ b/apps/web/src/features/skills/skill-operations.test.ts
@@ -1,14 +1,11 @@
 import { describe, expect, it, vi } from "vitest";
 
-import { AgentCoreError, type Skill, type SkillList, type SkillVersion, type SkillVersionList } from "@oac/agents-client";
+import type { Skill, SkillVersion } from "@oac/agents-client";
 
 import type { ProjectClient } from "../../lib/projects";
-import i18n from "../../i18n";
 import {
   downloadSkillArchive,
   filterSkills,
-  isDefaultVersionConflict,
-  readSkillsPage,
   skillArchiveFilename,
   versionDeleteState,
 } from "./skill-operations";
@@ -41,10 +38,6 @@ function version(number: string, overrides: Partial<SkillVersion> = {}): SkillVe
   };
 }
 
-function coreError(status: number, code: string | null = null, param: string | null = null, message = "Core said no."): AgentCoreError {
-  return new AgentCoreError(message, status, code, param);
-}
-
 
 
 describe("Skill version deletion states", () => {
@@ -73,16 +66,6 @@ describe("Skill list helpers", () => {
     expect(filterSkills(skills, "")).toHaveLength(2);
   });
 
-  it("reads pages newest first with the Skill cursor", async () => {
-    const listSkills = vi.fn(async (): Promise<SkillList> => ({
-      object: "list", data: [skillFixture({ id: "skill_c" })], has_more: true, first_id: "skill_c", last_id: "skill_c",
-    }));
-    const page = await readSkillsPage({ listSkills }, [skillFixture({ id: "skill_d" })], "skill_d");
-    expect(listSkills).toHaveBeenCalledWith({ after: "skill_d", limit: 20, order: "desc", signal: undefined });
-    expect(page.values.map((skill) => skill.id)).toEqual(["skill_d", "skill_c"]);
-    expect(page.nextAfter).toBe("skill_c");
-  });
-
   it("names archives after the Skill and version", () => {
     expect(skillArchiveFilename("report", "2")).toBe("report-v2.zip");
     expect(skillArchiveFilename("a/b:c", "1")).toBe("a-b-c-v1.zip");
diff --git a/apps/web/src/features/skills/skill-operations.ts b/apps/web/src/features/skills/skill-operations.ts
index 3df3f118b..cca3a2b9c 100644
--- a/apps/web/src/features/skills/skill-operations.ts
+++ b/apps/web/src/features/skills/skill-operations.ts
@@ -5,10 +5,6 @@ import { appendCollectionPage } from "../../lib/collection-pagination";
 
 export const SKILLS_PAGE_SIZE = 20;
 
-export function isAbortError(error: unknown): boolean {
-  return (error instanceof DOMException || error instanceof Error) && error.name === "AbortError";
-}
-
 /** Core rejects deleting the default while other versions remain (400 invalid_value on `version`). */
 export function isDefaultVersionConflict(error: unknown): boolean {
   return error instanceof AgentCoreError && error.status === 400 && error.code === "invalid_value" && error.param === "version";
@@ -89,17 +85,6 @@ export async function downloadSkillArchive(
   return filename;
 }
 
-/** Reads the next Skill page (newest first) and appends it to the loaded rows. */
-export async function readSkillsPage(
-  core: Pick<ProjectClient, "listSkills">,
-  loaded: readonly Skill[],
-  after: string | undefined,
-  signal?: AbortSignal,
-): Promise<{ values: Skill[]; nextAfter: string | null }> {
-  const page = await core.listSkills({ after, limit: SKILLS_PAGE_SIZE, order: "desc", signal });
-  return appendCollectionPage(loaded, page, after);
-}
-
 /** Reads the next version page (highest version first) and appends it to the loaded rows. */
 export async function readSkillVersionsPage(
   core: Pick<ProjectClient, "listSkillVersions">,
diff --git a/apps/web/src/features/system/system.css b/apps/web/src/features/system/system.css
index dab425033..4934deb49 100644
--- a/apps/web/src/features/system/system.css
+++ b/apps/web/src/features/system/system.css
@@ -81,14 +81,6 @@
   gap: 12px;
 }
 
-/* The fixed protocol in the provider form: a value, not a control. */
-.system-model-protocol {
-  margin: 0;
-  color: var(--fg);
-  font-size: 13px;
-  line-height: 18px;
-}
-
 /* Advanced model settings stay in the edit dialog. */
 .system-model-advanced > summary {
   cursor: pointer;
diff --git a/apps/web/src/features/vaults/VaultsPage.tsx b/apps/web/src/features/vaults/VaultsPage.tsx
index 516cd90e8..e3286d5aa 100644
--- a/apps/web/src/features/vaults/VaultsPage.tsx
+++ b/apps/web/src/features/vaults/VaultsPage.tsx
@@ -11,7 +11,7 @@ import { useConsoleNavigation } from "../../lib/console-navigation";
 import { coreError } from "../../lib/core-error";
 import { useDeleteFlow } from "../../lib/delete-flow";
 import { formatDateTime } from "../../lib/format";
-import { CreatorCell, CreatorHeading, forgetCreators, ProjectFilter, ProjectName, projectClient, readAllPages, useCreators, useProjectCollection, useProjects, type Owned } from "../../lib/projects";
+import { CreatorCell, CreatorHeading, forgetCreators, ProjectFilter, ProjectName, projectClient, useCreators, useProjectCollection, useProjects, type Owned } from "../../lib/projects";
 import "./vaults.css";
 import { collections } from "../../lib/queries";
 import { DetailSkeleton, TableSkeleton } from "../../components/Skeleton";
@@ -148,7 +148,7 @@ function VaultDetail({ projectId, vaultId }: { projectId: string; vaultId: strin
   const { t: tPages } = useTranslation("pages");
   const { t: tCommon } = useTranslation();
   const locale = i18n.resolvedLanguage;
-  const { navigate, back: goBack } = useConsoleNavigation();
+  const { back: goBack } = useConsoleNavigation();
   const { byId } = useProjects();
   const project = byId.get(projectId);
   // The Vault opens from the cache (or its list row) at once; its Credentials read beside it.
diff --git a/apps/web/src/i18n/locales/en/navigation.ts b/apps/web/src/i18n/locales/en/navigation.ts
index 244124535..6a779edb0 100644
--- a/apps/web/src/i18n/locales/en/navigation.ts
+++ b/apps/web/src/i18n/locales/en/navigation.ts
@@ -1,5 +1,4 @@
 export const navigation = {
-  console: "Console",
   mainNavigation: "Console navigation",
   groups: {
     monitor: "Monitor",
@@ -31,7 +30,5 @@ export const navigation = {
   lightTheme: "Light theme",
   darkTheme: "Dark theme",
   language: "Language",
-  english: "English",
-  chinese: "简体中文",
   appearanceSettings: "Language and appearance",
 } as const;
diff --git a/apps/web/src/i18n/locales/en/templates.ts b/apps/web/src/i18n/locales/en/templates.ts
index 929094790..b767fa381 100644
--- a/apps/web/src/i18n/locales/en/templates.ts
+++ b/apps/web/src/i18n/locales/en/templates.ts
@@ -2,7 +2,6 @@ export const templates = {
   boundary: "Applications create and change templates through the Agents API with a project API key. The console only inspects and deletes them.",
   refreshFailed: "The catalog could not be refreshed. Check the connection and try again.",
   created: "Template created. No Runtime was allocated.",
-  updated: "Template updated. Existing Sessions keep their configuration.",
   deleted: "Template deleted.",
   loading: "Loading Environment templates…",
   loadFailedTitle: "Environment templates could not be loaded",
@@ -11,7 +10,6 @@ export const templates = {
   count: "{{visible}} of {{total}} templates",
   emptyTitle: "No Environment templates yet",
   noMatch: "No matching templates",
-  clearFilter: "Clear filter",
   listLabel: "Environment templates",
   columns: {
     name: "Name", network: "Network", packages: "Packages", files: "Files", skills: "Skills",
@@ -19,7 +17,6 @@ export const templates = {
   },
   access: { enabled: "Enabled", disabled: "Disabled", restricted: "Restricted" },
   accessHelp: "Sessions with this policy are rejected, because the Runtime does not restrict network access.",
-  edit: "Edit",
   delete: "Delete",
   deleteLabel: "Delete {{name}}",
   open: "Open {{name}}",
diff --git a/apps/web/src/i18n/locales/zh-CN/navigation.ts b/apps/web/src/i18n/locales/zh-CN/navigation.ts
index 6a3eb847f..9c8c2d786 100644
--- a/apps/web/src/i18n/locales/zh-CN/navigation.ts
+++ b/apps/web/src/i18n/locales/zh-CN/navigation.ts
@@ -1,5 +1,4 @@
 export const navigation = {
-  console: "控制台",
   mainNavigation: "控制台导航",
   groups: {
     monitor: "监控",
@@ -31,7 +30,5 @@ export const navigation = {
   lightTheme: "浅色主题",
   darkTheme: "深色主题",
   language: "语言",
-  english: "English",
-  chinese: "简体中文",
   appearanceSettings: "语言和外观",
 } as const;
diff --git a/apps/web/src/i18n/locales/zh-CN/sandbox.ts b/apps/web/src/i18n/locales/zh-CN/sandbox.ts
index 226abd64d..b7b60098c 100644
--- a/apps/web/src/i18n/locales/zh-CN/sandbox.ts
+++ b/apps/web/src/i18n/locales/zh-CN/sandbox.ts
@@ -100,7 +100,6 @@ export const sandbox = {
   "Sandbox state changed. Close this dialog and review the current state.": "沙箱状态已改变。请关闭对话框并查看当前状态。",
   "Node state could not be read": "无法读取节点状态",
   "Node enrollment is paused while reset is in progress.": "重置过程中暂停注册节点。",
-  "Reset the sandbox deployment before changing this configuration.": "请先重置沙箱部署，再更改此配置。",
   "Core records these sandboxes as suspended. Their next Turn requests a resume when compatible capacity is available. They count toward the retained limit, not the active one.": "Core 将这些沙箱记录为已挂起。下一个 Turn 会在兼容容量可用时请求恢复。它们占用保留名额，不占活跃名额。",
   "The most sandboxes this node holds at once: starting, running and suspended.": "这台节点同时最多容纳的沙箱数，包括启动中、运行中和已挂起的。",
   "Edit node": "编辑节点",
diff --git a/apps/web/src/i18n/locales/zh-CN/templates.ts b/apps/web/src/i18n/locales/zh-CN/templates.ts
index a9cca78e0..62aeec4a0 100644
--- a/apps/web/src/i18n/locales/zh-CN/templates.ts
+++ b/apps/web/src/i18n/locales/zh-CN/templates.ts
@@ -3,15 +3,15 @@ type TranslationShape<T> = { [K in keyof T]: T[K] extends string ? string : Tran
 export const templates: TranslationShape<typeof english> = {
   boundary: "模板由应用使用项目 API 密钥通过 Agents API 创建和修改；控制台只查看和删除。",
   refreshFailed: "无法刷新目录。请检查连接后重试。",
-  created: "模板已创建，未分配 Runtime。", updated: "模板已更新。现有 Session 会保留原配置。", deleted: "模板已删除。",
+  created: "模板已创建，未分配 Runtime。", deleted: "模板已删除。",
   loading: "正在加载 Environment 模板…",
   loadFailedTitle: "无法加载 Environment 模板",
   filterLabel: "筛选模板", filterPlaceholder: "按名称或 ID 筛选", count: "显示 {{visible}} / {{total}} 个模板",
-  emptyTitle: "还没有 Environment 模板", noMatch: "没有匹配的模板", clearFilter: "清除筛选", listLabel: "Environment 模板",
+  emptyTitle: "还没有 Environment 模板", noMatch: "没有匹配的模板", listLabel: "Environment 模板",
   columns: { name: "名称", network: "网络", packages: "依赖包", files: "文件", skills: "Skill", plugins: "Plugin", updated: "更新时间", actions: "操作" },
   access: { enabled: "已启用", disabled: "已禁用", restricted: "受限" },
   accessHelp: "使用此策略的 Session 会被拒绝，因为 Runtime 不限制网络访问。",
-  edit: "编辑", delete: "删除", deleteLabel: "删除 {{name}}", open: "打开 {{name}}", back: "返回",
+  delete: "删除", deleteLabel: "删除 {{name}}", open: "打开 {{name}}", back: "返回",
   unrecognized: "含无法识别的配置",
   unrecognizedHelp: "Core 返回了控制台无法识别的配置。可识别的部分照常显示，其余部分不做推测。",
   unrecognizedSections: "控制台无法识别：{{sections}}",
diff --git a/apps/web/src/lib/sandbox-diagnostic.test.ts b/apps/web/src/lib/sandbox-diagnostic.test.ts
index e1b5d934d..9031b628f 100644
--- a/apps/web/src/lib/sandbox-diagnostic.test.ts
+++ b/apps/web/src/lib/sandbox-diagnostic.test.ts
@@ -1,4 +1,3 @@
-import { sandboxNodeDiagnostics, type SandboxNodeDiagnostic } from "@oac/agents-client";
 import { describe, expect, it } from "vitest";
 import { nodeProviderDiagnostic, sandboxDiagnosticMessage } from "./sandbox-diagnostic";
 
diff --git a/apps/web/src/style.css b/apps/web/src/style.css
index 00c0f0e3c..a7c21bad1 100644
--- a/apps/web/src/style.css
+++ b/apps/web/src/style.css
@@ -188,17 +188,12 @@ html[data-theme="dark"] .brand-mark {
   filter: invert(1);
 }
 
-.brand-name,
-.brand-product {
+.brand-name {
   overflow: hidden;
   font-size: 14px;
   text-overflow: ellipsis;
 }
 
-.brand-product {
-  color: var(--fg-muted);
-}
-
 .main-nav {
   margin-top: 14px;
 }
@@ -567,39 +562,6 @@ html[data-theme="dark"] .brand-mark {
   color: var(--fg-muted);
 }
 
-/* Shared ledger primitives. */
-
-.ledger {
-  min-height: 0;
-  flex: 1;
-  overflow: auto;
-}
-
-.ledger-row {
-  display: grid;
-  grid-template-columns:
-    minmax(220px, 2fr) minmax(140px, 1fr) 72px 100px 124px;
-  min-width: 760px;
-  align-items: center;
-  padding: 0 14px 0 24px;
-  column-gap: 10px;
-}
-
-.ledger-row {
-  position: relative;
-  height: 36px;
-  color: var(--fg);
-  font-size: 13px;
-  line-height: 18px;
-  border-bottom: 1px solid var(--line);
-  transition: background-color 150ms var(--ease-settle);
-}
-
-.ledger-row:hover,
-.ledger-row:focus-within {
-  background: var(--hover);
-}
-
 .status-icon {
   display: block;
   width: 14px;
@@ -2051,17 +2013,6 @@ button.trace-step-row:hover {
   line-height: 16px;
 }
 
-.field > .field-label {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 8px;
-  color: var(--fg-muted);
-  font-size: 12px;
-  font-weight: 400;
-  line-height: 16px;
-}
-
 .field input,
 .field textarea,
 .field select {
@@ -2340,26 +2291,6 @@ button.trace-step-row:hover {
   min-width: 0;
 }
 
-.vault-credentials {
-  margin-top: 14px;
-  padding-top: 12px;
-  border-top: 1px solid var(--line-muted);
-}
-
-.vault-credentials h3 {
-  display: flex;
-  justify-content: space-between;
-  margin: 0 0 8px;
-  font-size: 11px;
-  font-weight: 600;
-  letter-spacing: 0.03em;
-  text-transform: uppercase;
-}
-
-.vault-credentials h3 span {
-  color: var(--fg-muted);
-}
-
 @media (max-width: 640px) {
   .vaults-page .page-header {
     min-height: auto;
diff --git a/apps/web/src/styles/console.css b/apps/web/src/styles/console.css
index bd0d3a328..75358f68f 100644
--- a/apps/web/src/styles/console.css
+++ b/apps/web/src/styles/console.css
@@ -42,13 +42,6 @@ html[data-theme="dark"] {
   to { opacity: 1; }
 }
 
-/* Sidebar ------------------------------------------------------------- */
-
-.brand-lockup .brand-product {
-  margin-left: 2px;
-  font-size: 12px;
-}
-
 .console-nav {
   margin-top: 6px;
 }
@@ -514,25 +507,6 @@ html[data-theme="dark"] {
   font-variant-numeric: tabular-nums;
 }
 
-.select-control select {
-  height: 28px;
-  max-width: 220px;
-  padding: 0 28px 0 9px;
-  color: var(--fg);
-  font-size: 13px;
-  background: var(--surface) url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6' fill='none'%3E%3Cpath d='m1 1 4 4 4-4' stroke='%23787774' stroke-width='1.4' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E") no-repeat right 10px center;
-  border: 1px solid var(--line-strong);
-  border-radius: 6px;
-  box-shadow: var(--shadow-control);
-  appearance: none;
-}
-
-.select-control select:focus-visible {
-  outline: none;
-  border-color: var(--accent);
-  box-shadow: 0 0 0 1px var(--accent);
-}
-
 /* Lists --------------------------------------------------------------- */
 
 /* Every resource list: search first, then filters, the count on the right. */
@@ -880,13 +854,6 @@ html[data-theme="dark"] {
   cursor: pointer;
 }
 
-.table-truncate {
-  max-width: 360px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
 .table-muted {
   color: var(--fg-muted);
 }
diff --git a/apps/web/src/styles/magicui-theme.css b/apps/web/src/styles/magicui-theme.css
index c958565e6..1f260753f 100644
--- a/apps/web/src/styles/magicui-theme.css
+++ b/apps/web/src/styles/magicui-theme.css
@@ -7,7 +7,6 @@
  */
 @theme inline {
   --animate-orbit: orbit calc(var(--duration) * 1s) linear infinite;
-  --animate-shiny-text: shiny-text 8s infinite;
 
   @keyframes orbit {
     0% {
@@ -17,9 +16,4 @@
       transform: rotate(calc(var(--angle) * 1deg + 360deg)) translateY(calc(var(--radius) * 1px)) rotate(calc((var(--angle) * -1deg) - 360deg));
     }
   }
-
-  @keyframes shiny-text {
-    0%, 90%, 100% { background-position: calc(-100% - var(--shiny-width)) 0; }
-    30%, 60% { background-position: calc(100% + var(--shiny-width)) 0; }
-  }
 }
diff --git a/apps/web/src/styles/system.css b/apps/web/src/styles/system.css
index 095c43859..7aa3aae4d 100644
--- a/apps/web/src/styles/system.css
+++ b/apps/web/src/styles/system.css
@@ -147,13 +147,6 @@ pre {
   letter-spacing: -0.01em;
 }
 
-.brand-product,
-.brand-lockup .brand-product {
-  color: var(--ink-3);
-  font-size: 12.5px;
-  font-weight: 500;
-}
-
 .console-nav .nav-label {
   padding: 14px 8px 6px;
   color: var(--ink-3);
@@ -258,7 +251,6 @@ pre {
   }
 
   .console-nav .nav-label,
-  .brand-product,
   .console-account-menu > button > span {
     display: none;
   }
@@ -525,7 +517,6 @@ pre {
 .field input,
 .field textarea,
 .field select,
-.select-control select,
 .search-control {
   min-height: var(--control-height);
   color: var(--ink);
@@ -556,7 +547,6 @@ pre {
 .field input:hover,
 .field textarea:hover,
 .field select:hover,
-.select-control select:hover,
 .search-control:hover {
   background-color: var(--hover-2);
 }
@@ -564,7 +554,6 @@ pre {
 .field input:focus,
 .field textarea:focus,
 .field select:focus,
-.select-control select:focus-visible,
 .search-control:focus-within {
   outline: none;
   background-color: var(--surface);
@@ -572,8 +561,7 @@ pre {
   box-shadow: 0 0 0 1px var(--accent), 0 0 0 4px var(--accent-tint);
 }
 
-.field > span,
-.field > .field-label {
+.field > span {
   color: var(--ink-2);
   font-size: 12.5px;
   font-weight: 500;
@@ -581,37 +569,20 @@ pre {
 
 /* On the canvas (toolbars, headers) a control is a ringed white surface, like a
    secondary button; inside cards and dialogs it is a filled field. */
-.list-toolbar .search-control,
-.list-toolbar .select-control select,
-.page-header .select-control select,
-.console-section-header .select-control select {
+.list-toolbar .search-control {
   background-color: var(--surface);
   box-shadow: var(--shadow-btn);
 }
 
-.list-toolbar .search-control:hover,
-.list-toolbar .select-control select:hover,
-.page-header .select-control select:hover,
-.console-section-header .select-control select:hover {
+.list-toolbar .search-control:hover {
   background-color: var(--inset);
 }
 
-.list-toolbar .search-control:focus-within,
-.list-toolbar .select-control select:focus-visible,
-.page-header .select-control select:focus-visible,
-.console-section-header .select-control select:focus-visible {
+.list-toolbar .search-control:focus-within {
   background-color: var(--surface);
   box-shadow: 0 0 0 1px var(--accent), 0 0 0 4px var(--accent-tint);
 }
 
-.select-control select {
-  height: var(--control-height);
-  padding: 0 30px 0 10px;
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6' fill='none'%3E%3Cpath d='m1 1 4 4 4-4' stroke='%239096a2' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
-  background-repeat: no-repeat;
-  background-position: right 11px center;
-}
-
 .search-control {
   height: var(--control-height);
   align-items: center;
@@ -838,11 +809,6 @@ pre {
   box-shadow: var(--shadow-hairline);
 }
 
-.pill-green { color: var(--green); background: var(--green-tint); box-shadow: 0 0 0 1px color-mix(in oklch, var(--green) 28%, transparent); }
-.pill-orange { color: var(--orange); background: var(--orange-tint); box-shadow: 0 0 0 1px color-mix(in oklch, var(--orange) 28%, transparent); }
-.pill-red { color: var(--red); background: var(--red-tint); box-shadow: 0 0 0 1px color-mix(in oklch, var(--red) 28%, transparent); }
-.pill-accent { color: var(--accent-ink); background: var(--accent-tint); box-shadow: 0 0 0 1px color-mix(in oklch, var(--accent) 28%, transparent); }
-
 .meter {
   height: 5px;
   background: var(--field);
diff --git a/package.json b/package.json
index f67bd61e2..9dc4e8004 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,6 @@
   "scripts": {
     "dev:web": "pnpm --filter @oac/web dev",
     "build:web": "pnpm --filter @oac/web build",
-    "typecheck": "pnpm -r --if-present typecheck",
-    "test": "pnpm --dir packages/claude-sdk-adapter test && pnpm test:web",
     "test:web": "pnpm --filter @oac/agents-client test && pnpm --filter @oac/web test",
     "test:web:acceptance": "pnpm --filter @oac/web test:acceptance"
   }
diff --git a/packages/agents-client/README.md b/packages/agents-client/README.md
index e35675888..1c7841711 100644
--- a/packages/agents-client/README.md
+++ b/packages/agents-client/README.md
@@ -25,7 +25,7 @@ Behavior shared by the clients:
 - **Errors.** A non-2xx response throws `AgentCoreError` with `status`, `code`, `param`, `errorType` and, from the Core API, the optional `details` of the [Core error envelope](../../contracts/agents-api/core-errors.md). Input the client cannot send, such as a malformed resource ID, throws `TypeError` before any request; Core enforces size, count and range limits.
 - **No retries or timeouts.** No client retries a request. Pass `signal` to cancel one.
 - **Idempotency.** `createSession` takes an idempotency key and generates one when omitted; pass your own to retry a creation safely. `sendMessage`, `submitEvents`, `cancelTurn` and `submitFunctionResult` require one. `randomUuid()` makes one.
-- **Streams.** `streamEvents` and `createSessionStream` decode the live event stream with `createSSEDecoder` and validate each event. Recover missed events with ordinary reads; the decoder does not resume with `Last-Event-ID`.
+- **Streams.** `streamEvents` and `createSessionStream` decode the live event stream and validate each event. Recover missed events with ordinary reads; the decoder does not resume with `Last-Event-ID`.
 
 ### Saved Agent and deployment defaults
 
diff --git a/packages/agents-client/src/index.ts b/packages/agents-client/src/index.ts
index 1c75802ac..2c450c799 100644
--- a/packages/agents-client/src/index.ts
+++ b/packages/agents-client/src/index.ts
@@ -1,17 +1,12 @@
-export { coreHarnessKinds, coreHarnessNames, modelProviderProtocols } from "./harness-catalog";
+export { coreHarnessNames, modelProviderProtocols } from "./harness-catalog";
 export { deploymentContract } from "./deployment-contract";
-export { AgentCoreError, CreationStreamRetryError, isSessionDeletionConflict, OpenAIAgentsClient, randomUuid } from "./client";
+export { AgentCoreError, isSessionDeletionConflict, OpenAIAgentsClient, randomUuid } from "./client";
 export type { OpenAIAgentsClientOptions, CoreErrorDetail, CoreErrorDetails } from "./client";
-export { createSSEDecoder } from "./sse";
-export type { SSEDecoder, SSEMessage } from "./sse";
 export type * from "./types";
 export * from "./sandbox-client";
 export * from "./core-metrics";
 export type { CoreClientOptions } from "./core-request";
-export { isEnvironmentTemplateName, isRecognizedEnvironmentTemplate } from "./environment-template-projection";
-export { isOpenAIHostedSessionEnvironment } from "./session-environment-projection";
 export { tokenLimitsFit } from "./execution-configuration-projection";
-export { compareSkillVersionNumbers, isSkillId, isSkillUploadPath, isSkillVersionId, isSkillVersionNumber } from "./skill-projection";
 export { AdminClient } from "./admin-client";
 // Skill, SkillVersion and SessionArtifact come from ./types; the admin projections use the same shapes.
 export { adminResourceTypes } from "./admin-types";
diff --git a/packages/agents-client/src/protocol-types.test.ts b/packages/agents-client/src/protocol-types.test.ts
index a720a95bd..cd1722dcb 100644
--- a/packages/agents-client/src/protocol-types.test.ts
+++ b/packages/agents-client/src/protocol-types.test.ts
@@ -11,7 +11,6 @@ import vaultCredentials182d from "./fixtures/parsar-182d333d/vault-credentials.j
 import turnResources from "./fixtures/parsar-0438880a/turn-resources.json";
 import toolProfiles from "./fixtures/parsar-2b34ea46/tool-profiles.json";
 import type {
-  AnonymousHttpMcpToolInput,
   McpToolInput,
   AgentsCoreSelection,
   SavedAgentCoreInput,
@@ -20,8 +19,6 @@ import type {
   AgentSnapshot,
   ModelProviderInput,
   ModelProviderView,
-  ModelConfigurationInput,
-  ModelConfigurationView,
   HarnessConfig,
   AgentCore,
   AgentSession,
@@ -30,11 +27,9 @@ import type {
   AgentTurn,
   AgentSessionEnvironmentEvent,
   CreateAgentInput,
-  EnvironmentConnectionAction,
   EnvironmentFileList,
   EnvironmentFileCreateInput,
   EnvironmentResourceStatus,
-  FunctionCallAction,
   InlineAgentInput,
   OpenAIHostedAgentEnvironment,
   OpenAIHostedAgentEnvironmentInput,
@@ -51,11 +46,9 @@ import type {
   UnknownSessionItem,
   SessionItem,
   SessionInputEvent,
-  SessionMessageInputEvent,
   SessionToolResultInputEvent,
   SessionEnvironmentStatus,
   TokenUsage,
-  TurnStatus,
   UpdateAgentInput,
   Vault,
   VaultCredential,
@@ -113,7 +106,7 @@ describe("Parsar dadf64a7 basic managed Environment profile", () => {
 describe("Parsar dadf64a7 ordered Session input batch", () => {
   it("pins the three exact public wire variants and their ordered nested inputs", () => {
     const events = eventBatchDadf64.request.events as SessionInputEvent[];
-    const message = events[0] as SessionMessageInputEvent;
+    const message = events[0] as Extract<SessionInputEvent, { type: "agent.session.input.message" }>;
     const result = events[2] as SessionToolResultInputEvent;
 
     expect(eventBatchDadf64.revision).toBe("dadf64a76bde58255281f3b6c3e939f8b556be09");
@@ -130,7 +123,7 @@ describe("Parsar dadf64a7 ordered Session input batch", () => {
       { type: "input_text", text: "" },
       { type: "input_image", image_url: "data:image/png;base64,AA==" },
     ]);
-    expectTypeOf<SessionMessageInputEvent["input"]>().toEqualTypeOf<import("./types").InputMessage[]>();
+    expectTypeOf<typeof message.input>().toEqualTypeOf<import("./types").InputMessage[]>();
     expectTypeOf<SessionToolResultInputEvent["output"]>()
       .toEqualTypeOf<string | import("./types").FunctionResultContent[] | null | undefined>();
   });
@@ -170,7 +163,7 @@ describe("Parsar 2b34ea46 bounded tool profiles", () => {
 
   it("captures the two Web-configurable write shapes without credentials or browser MCP", () => {
     const functionTool = toolProfiles.write_profiles.function;
-    const mcpTool = toolProfiles.write_profiles.anonymous_http_mcp as AnonymousHttpMcpToolInput;
+    const mcpTool = toolProfiles.write_profiles.anonymous_http_mcp;
 
     expect(functionTool.defer_loading).toBe(false);
     expect(functionTool.parameters.type).toBe("object");
@@ -214,8 +207,6 @@ describe("Core harness selection extension", () => {
     expectTypeOf<AgentSnapshot["x_agents_core"]>().toEqualTypeOf<AgentsCoreSelection | null | undefined>();
     expectTypeOf<ModelProviderView>().not.toExtend<ModelProviderInput>();
     expectTypeOf<ModelProviderInput>().not.toExtend<ModelProviderView>();
-    expectTypeOf<ModelConfigurationInput>().not.toExtend<ModelConfigurationView>();
-    expectTypeOf<ModelConfigurationView>().not.toExtend<ModelConfigurationInput>();
     expectTypeOf<SavedAgentCoreInput["harness_config"]>().toEqualTypeOf<HarnessConfig | undefined>();
     expectTypeOf<AgentsCoreSelection["harness_config"]>().toEqualTypeOf<HarnessConfig | undefined>();
     expectTypeOf<SavedAgentCore>().not.toExtend<SavedAgentCoreInput>();
@@ -322,8 +313,8 @@ describe("Parsar 8cc2898c Environment protocol types", () => {
 
   it("models both required action variants without inventing shared fields", () => {
     const actions = fixture.required_actions as RequiredAction[];
-    const functionCall = actions[0] as FunctionCallAction;
-    const environmentConnection = actions[1] as EnvironmentConnectionAction;
+    const functionCall = actions[0] as Extract<RequiredAction, { type: "function_call" }>;
+    const environmentConnection = actions[1] as Extract<RequiredAction, { type: "environment_connection" }>;
 
     expect(functionCall.type).toBe("function_call");
     expect(functionCall.arguments).toEqual({ query: "fixture" });
@@ -418,7 +409,7 @@ describe("Parsar 0438880a Turn observability resources", () => {
       "completed",
       "failed",
       "cancelled",
-    ] satisfies TurnStatus[]);
+    ] satisfies AgentTurn["status"][]);
     expect(turns[0]?.started_at).toBeNull();
     expect(turns[0]?.usage).toBeNull();
     expect(turns[3]?.completed_at).toBe(1700000068);
diff --git a/packages/agents-client/src/sandbox-client.test.ts b/packages/agents-client/src/sandbox-client.test.ts
index 731667484..46e4f9b18 100644
--- a/packages/agents-client/src/sandbox-client.test.ts
+++ b/packages/agents-client/src/sandbox-client.test.ts
@@ -1,8 +1,9 @@
 import { describe, expect, expectTypeOf, it, vi } from "vitest";
 import { AgentCoreError, OpenAIAgentsClient } from "./client";
-import { SandboxAdminClient, normalizeSandboxNodeDiagnostic, sandboxNodeDiagnostics, type SandboxNode } from "./sandbox-client";
+import { SandboxAdminClient, normalizeSandboxNodeDiagnostic, type SandboxNode } from "./sandbox-client";
 
 import { deploymentContract } from "./deployment-contract";
+import { nodeDiagnosticCodeValues } from "./generated/core-api";
 import nodeDiagnosticFixture from "../../../services/core/internal/sandbox/testdata/node-diagnostics.json";
 
 function response(value: unknown, status = 200) { return new Response(JSON.stringify(value), { status }); }
@@ -417,7 +418,7 @@ it.each(["unknown", "preparing", "failed"])("does not erase old serving readines
 
 describe("shared node diagnostic contract", () => {
   it("checks the client declaration against the Go diagnostic fixture", () => {
-    expect([...sandboxNodeDiagnostics].sort()).toEqual([...nodeDiagnosticFixture].sort());
+    expect([...nodeDiagnosticCodeValues].sort()).toEqual([...nodeDiagnosticFixture].sort());
     expect(normalizeSandboxNodeDiagnostic("future_code")).toBe("provider_unavailable");
   });
   it.each(nodeDiagnosticFixture)("preserves %s through the rollout projection", async (diagnostic) => {
diff --git a/packages/agents-client/src/sandbox-client.ts b/packages/agents-client/src/sandbox-client.ts
index d5030a1e8..c4fd8ba8b 100644
--- a/packages/agents-client/src/sandbox-client.ts
+++ b/packages/agents-client/src/sandbox-client.ts
@@ -15,8 +15,6 @@ import {
 } from "./generated/core-api";
 import type { ReadOptions } from "./types";
 
-/** Checked against Core's shared node-diagnostics.json fixture. */
-export const sandboxNodeDiagnostics = nodeDiagnosticCodeValues;
 /** Fixed reason a node's provider is not ready. Core omits the field while the provider is ready, so read it as falsy (undefined) then. The client reads an unknown future value as provider_unavailable. */
 export type SandboxNodeDiagnostic = NodeDiagnosticCode;
 
diff --git a/packages/agents-client/src/types.ts b/packages/agents-client/src/types.ts
index 93f06d8e0..11f39200f 100644
--- a/packages/agents-client/src/types.ts
+++ b/packages/agents-client/src/types.ts
@@ -5,20 +5,14 @@ import type {
   DeletedSkillVersionResource, DeletedVaultCredentialResource, DeletedVaultResource, DeleteFileResponse,
   EnvironmentFileListResource, EnvironmentFileResource, EnvironmentPackagesResource, EnvironmentParamNone,
   EnvironmentParamSelfHosted, EnvironmentResourceSelfHosted, EnvironmentStatusResource, FunctionCallStatusResource,
-  HostedEnvironmentFileParam, InputContentParam, InputContentParamInputText, InputMessageParam, ListOrderParam,
-  McpOauthRefreshResource, MultiAgentConfigCurrentParam, MultiAgentConfigResource, NetworkAccessResource,
-  NetworkPolicyResource, PersistedAgentToolConfigParamFunction, PersistedAgentToolConfigParamMcp, PersistedAgentToolConfigParamProgrammaticToolCalling,
-  PersistedAgentToolConfigParamToolSearch, PersistedAgentToolConfigParamWebSearch, ReasoningEffortResource,
-  ReasoningParam, ReasoningResource, ReasoningSummaryResource, RotateVaultCredentialAuthParamStaticBearer,
+  HostedEnvironmentFileParam, InputContentParam, InputMessageParam, ListOrderParam,
+  McpOauthRefreshResource, MultiAgentConfigCurrentParam, MultiAgentConfigResource, NetworkPolicyResource, PersistedAgentToolConfigParamFunction, PersistedAgentToolConfigParamMcp, PersistedAgentToolConfigParamProgrammaticToolCalling,
+  PersistedAgentToolConfigParamToolSearch, PersistedAgentToolConfigParamWebSearch, ReasoningParam, ReasoningResource, RotateVaultCredentialAuthParamStaticBearer,
   RotateVaultCredentialParams, ServiceTierResource, SessionEnvironmentStateResource, SessionEnvironmentStatusResource,
-  SessionArtifactResource, SessionErrorResource, SessionInputParam, SessionInputParamAgentSessionInputCancel,
-  SessionInputParamAgentSessionInputMessage, SessionInputParamAgentSessionInputToolResult,
-  SessionRequiredActionResource, SessionRequiredActionResourceEnvironmentConnection,
-  SessionRequiredActionResourceFunctionCall, SessionStatusResource, SkillResource, SkillVersionResource,
-  TextFormatResource, TextParam, TextResource, TokenUsageResource, TurnResource, TurnStatusResource,
-  VaultCredentialAuthResourceMcpOauth, VaultCredentialAuthResourceStaticBearer, VaultCredentialResource,
-  VaultResource, VaultStatusParam, WebSearchLocationParam,
-} from "./generated/public-api";
+  SessionArtifactResource, SessionErrorResource, SessionInputParam, SessionInputParamAgentSessionInputToolResult,
+  SessionRequiredActionResource, SessionStatusResource, SkillResource, SkillVersionResource,
+  TextParam, TextResource, TokenUsageResource, TurnResource, VaultCredentialResource,
+  VaultResource, VaultStatusParam, } from "./generated/public-api";
 import type {
   CoreHarness as CoreHarnessResource, ModelConfigurationSupport as ModelConfigurationSupportResource, RuntimeCPUObservation,
   RuntimeMemoryObservation, RuntimeObservationLifecycleState, RuntimeObservationReason,
@@ -47,12 +41,9 @@ export interface ReadOptions {
   signal?: AbortSignal;
 }
 
-export type AgentTextFormat = TextFormatResource;
 export type AgentTextConfig = TextResource;
 export type AgentTextInput = TextParam;
 export type AgentServiceTier = ServiceTierResource;
-export type AgentReasoningEffort = ReasoningEffortResource;
-export type AgentReasoningSummary = ReasoningSummaryResource;
 export type AgentReasoning = ReasoningParam;
 export type MultiAgentInput = MultiAgentConfigCurrentParam;
 
@@ -64,17 +55,10 @@ export type FunctionToolInput = PersistedAgentToolConfigParamFunction;
  */
 export type McpToolInput = PersistedAgentToolConfigParamMcp;
 
-/** Anonymous is an explicit subset that cannot name a stored Credential. */
-export type AnonymousHttpMcpToolInput = Omit<McpToolInput, "credential_id"> & {
-  credential_id?: null;
-};
-
 export type ToolSearchInput = PersistedAgentToolConfigParamToolSearch;
 
 export type ProgrammaticToolCallingInput = PersistedAgentToolConfigParamProgrammaticToolCalling;
 
-export type WebSearchLocationInput = WebSearchLocationParam;
-
 /**
  * Saved Agents keep every pinned mode; omitted or null `mode` is saved as `live`
  * and omitted or null `context_size` as `medium`. Session admission executes only
@@ -107,12 +91,8 @@ export type CreateVaultInput = CreateVaultParams;
 
 export type VaultDeleted = DeletedVaultResource;
 
-export type StaticBearerCredentialAuth = VaultCredentialAuthResourceStaticBearer;
-
 export type McpOAuthRefreshMetadata = McpOauthRefreshResource;
 
-export type McpOAuthCredentialAuth = VaultCredentialAuthResourceMcpOauth;
-
 export type VaultCredential = VaultCredentialResource;
 
 export type VaultCredentialList = ListPage<VaultCredential>;
@@ -212,12 +192,6 @@ export type SelfHostedAgentEnvironment = EnvironmentResourceSelfHosted;
 
 export type AgentEnvironmentPackages = EnvironmentPackagesResource;
 
-/**
- * Network policy of a hosted Environment or Template. `restricted` carries the
- * exact hostnames in Core's spelling and order; the other modes carry none.
- */
-export type EnvironmentNetworkAccess = NetworkAccessResource;
-
 export type EnvironmentNetworkPolicy = NetworkPolicyResource;
 
 /**
@@ -493,10 +467,6 @@ export interface SkillContent {
 
 export type SessionStatus = SessionStatusResource;
 
-export type FunctionCallAction = SessionRequiredActionResourceFunctionCall;
-
-export type EnvironmentConnectionAction = SessionRequiredActionResourceEnvironmentConnection;
-
 export type RequiredAction = SessionRequiredActionResource;
 
 export type TokenUsage = TokenUsageResource;
@@ -567,8 +537,6 @@ export interface CreateSessionInput {
   vault_ids?: string[];
 }
 
-export type InputTextContent = InputContentParamInputText;
-
 export type InputMessage = InputMessageParam;
 
 export type ItemStatus = FunctionCallStatusResource;
@@ -649,8 +617,6 @@ export interface WebSearchAction {
   pattern?: string | null;
 }
 
-export type TurnStatus = TurnStatusResource;
-
 export type AgentTurn = TurnResource;
 
 export type StreamError = SessionErrorResource;
@@ -750,10 +716,6 @@ export interface FunctionResultInput {
 
 export type FunctionResultContent = InputContentParam;
 
-export type SessionMessageInputEvent = SessionInputParamAgentSessionInputMessage;
-
-export type SessionCancelInputEvent = SessionInputParamAgentSessionInputCancel;
-
 export type SessionToolResultInputEvent = SessionInputParamAgentSessionInputToolResult;
 
 export type SessionInputEvent = SessionInputParam;
@@ -901,12 +863,6 @@ export interface ModelConfigurationInput {
   harness_config?: HarnessConfig;
 }
 
-export interface ModelConfigurationView {
-  model_provider: ModelProviderView;
-  model: string;
-  harness_config: HarnessConfig;
-}
-
 // The schema declares protocols as plain strings; the harness catalog names them.
 /** Adapter build support, independent of runtime readiness or model availability. Ordered protocols; the first is the default. */
 export type ModelConfigurationSupport = Omit<ModelConfigurationSupportResource, "protocols"> & { protocols: ModelProviderProtocol[] };
diff --git a/packages/agents-client/src/vault-credentials-oauth.test.ts b/packages/agents-client/src/vault-credentials-oauth.test.ts
index 611d4fbf5..1920639e9 100644
--- a/packages/agents-client/src/vault-credentials-oauth.test.ts
+++ b/packages/agents-client/src/vault-credentials-oauth.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 
 import { OpenAIAgentsClient } from "./client";
-import type { McpOAuthCredentialAuth, VaultCredential } from "./types";
+import type { VaultCredential } from "./types";
 
 const vaultId = "11111111-1111-4111-8111-111111111111";
 const credentialId = "22222222-2222-4222-8222-222222222222";
@@ -14,7 +14,7 @@ const staticCredential: VaultCredential = {
   created_at: 1,
   updated_at: 2,
 };
-const oauthAuth: McpOAuthCredentialAuth = {
+const oauthAuth: Extract<VaultCredential["auth"], { type: "mcp_oauth" }> = {
   type: "mcp_oauth",
   mcp_server_url: "https://mcp.example/tools",
   expires_at: "2030-01-01T00:00:00Z",